diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 538419e..081dd79 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -22,8 +22,38 @@ A release with an intentional breaking changes is marked with:
 * Technically breaking
 ** {issue}613[#612]: Remove all support for long obsolete and long untested PhantomJS
 ({lread})
+** {issue}467[#467]: Move to W3C WebDriver spec.
+({lread})
+*** The impetus was Firefox no longer supporting legacy `:capabilities` syntax.
+The breaking impact was on Chrome/Edge, when in "w3c mode" it will fail on WebDriver endpoints where there is a viable w3c alternative.
+This means some custom Chrome specific fns should now be expressed as w3c WebDriver actions.
+The following Chrome-specific fns have been deleted:
+**** `mouse-btn-down`
+**** `mouse-btn-up`
+**** `with-mouse-btn`
+**** `mouse-move-to` (was also available in Firefox)
+**** `mouse-click`
+**** `right-click`
+**** `left-click`
+**** `touch-down`
+**** `touch-move`
+**** `touch-up`
+*** Remove internal support for undocumented `:desired-capabilities`.
+The implementation was either ultra legacy or misunderstood legacy APIs.
 
 * Other changes
+** Add new fns that more lightly abstract W3C WebDriver Spec (as part of {issue}467[#467] API review sweep)
+({lread})
+*** `get-timeouts` - as alternative to `get-*-timeout`
+*** `set-timeouts` - as alternative to `set-*-timeout`
+*** `get-element-rect` - as alternative to `get-element-size`, `get-element-location`
+*** `get-element-rect-el` - as alternative to `get-element-size-el`, `get-element-location-el`
+*** `get-window-rect` - as alternative to `get-window-size`, `get-window-position`
+*** `set-window-rect` - as alternative to `set-window-size`, `set-window-position`
+** Review tests and add some missing coverage (as part of {issue}467[#467] API review sweep)
+({lread})
+** {issue}467[#467]: Required a full sweep of the API, so also includes:
+({lread})
 ** {pr}552[#552]: Add support for wide characters to input fill functions
 ({person}tupini07[@tupini07])
 ** {issue}566[#566]: Recognize `:driver-log-level` for Edge
@@ -48,6 +78,8 @@ A release with an intentional breaking changes is marked with:
 ({lread})
 *** {issue}602[#602]: Document all `:fn/*` query pseudo-functions in a definitive list
 ({person}dgr[@dgr])
+*** {issue}484[#484]: Add W3C WebDriver Spec links to docstrings
+*** {issue}522[#522]: Via better docstrings on getting properties
 
 == v1.0.40 - 2023-03-08 [[v1.0.40]]
 
diff --git a/bb.edn b/bb.edn
index 030eb45..4f0792f 100644
--- a/bb.edn
+++ b/bb.edn
@@ -66,8 +66,10 @@
                   :task test-server/-main}
   test:bb        {:doc "Runs tests under Babashka [--help]"
                   :task test/test-bb}
-  test-doc       {:doc "test code blocks in user guide"
+  test-doc       {:doc "Test code blocks in user guide"
                   :task test-doc/test-doc}
+  test-coverage  {:doc "Run doc and unit tests on JVM and generate ./target/clofidence code coverage report"
+                  :task test-coverage/-main}
   test-matrix    {:doc "Returns a test matrix for CI [--help]"
                   :task test-matrix/-main}
   drivers        {:doc "[list|kill] any running WebDrivers"
diff --git a/deps.edn b/deps.edn
index ef9d7c2..40ee03c 100644
--- a/deps.edn
+++ b/deps.edn
@@ -12,7 +12,7 @@
  :aliases
  {;; we use babashka/neil for project attributes
   ;; publish workflow references these values (and automatically bumps patch component of version)
-  :neil {:project {:version "1.0.40" ;; describes last release and is template for next release
+  :neil {:project {:version "1.1.40" ;; describes last release and is template for next release
                    :name  etaoin/etaoin
                    ;; not neilisms - could potentially conflict with new neilisms
                    :github-coords clj-commons/etaoin}}
@@ -51,6 +51,16 @@
                                           :vars [:symbol]}}
               :main-opts ["-m" "babashka.cli.exec"]}
 
+  :clofidence {:classpath-overrides {org.clojure/clojure nil}
+               :extra-deps {com.github.flow-storm/clojure {:mvn/version "LATEST"} ; >= 1.11.1-15
+                            com.github.flow-storm/clofidence {:mvn/version "LATEST"}}
+               :exec-fn clofidence.main/run
+               :exec-args {:report-name "Etaoin Test Coverage"
+                           :output-folder "target/clofidence"
+                           :test-fn cognitect.test-runner.api/test
+                           :test-fn-args [{:dirs ["test" "target/test-doc-blocks/test"]}]}
+               :jvm-opts ["-Dclojure.storm.instrumentOnlyPrefixes=etaoin"]}
+
   ;; for consistent linting we use a specific version of clj-kondo through the jvm
   :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.05.24"}}
               :main-opts ["-m" "clj-kondo.main"]}
diff --git a/doc/01-user-guide.adoc b/doc/01-user-guide.adoc
index ace2371..e096f9e 100644
--- a/doc/01-user-guide.adoc
+++ b/doc/01-user-guide.adoc
@@ -173,7 +173,7 @@ Edge and `msedgedriver` must match so you might need to specify the version:
 `scoop install edgedriver@101.0.1210.0`
 ** Download: link:{url-edge-dl}[Official Microsoft download site]
 
-Check your WebDriver installations launching by launching these commands.
+Check your WebDriver installations by launching these commands.
 Each should start a process that includes its own local HTTP server.
 Use Ctrl-C to terminate.
 
@@ -190,7 +190,7 @@ You can optionally run the Etaoin test suite to verify your installation.
 TIP: Some Etaoin API tests rely on ImageMagick.
 Install it prior to running test.
 
-From a clone of the https://github.com/clj-commons/etaoin[Etaoin GitHub repo]
+From a clone of the https://github.com/clj-commons/etaoin[Etaoin GitHub repo]:
 
 * To check tools of interest to Etaoin:
 +
@@ -333,7 +333,7 @@ A portion of the above rewritten with `doto`:
 ----
 
 == Playing Along in your REPL
-We encourage you to try the examples in from this user guide in your REPL.
+We encourage you to try the examples from this user guide in your REPL.
 
 The Interwebs is constantly changing.
 This makes testing against live sites impractical.
@@ -385,7 +385,7 @@ into:
 ;; => ["username2" "pass2" "some text2"]
 ----
 
-If any exception occurs during a browser session, the WebDriver process might hang until you kill it manually.
+If any exception occurs during a browser session, the WebDriver process might hang around until you kill it manually.
 To prevent that, we recommend the `with-<browser>` macros:
 
 [source,clojure]
@@ -939,7 +939,7 @@ The `query-shadow-root-el` and `query-all-shadow-root-el` allow you to specify t
 (def shadow-root (e/get-element-shadow-root-el driver host))
 (e/get-element-text-el driver (e/query-shadow-root-el driver shadow-root {:css "#in-shadow"}))
 ;; => "I'm in the shadow DOM"
- 
+
 (->> (e/query-all-shadow-root-el driver shadow-root {:css "span"})
      (map #(e/get-element-text-el driver %)))
 ;; > ("I'm in the shadow DOM" "I'm also in the shadow DOM")
@@ -1069,17 +1069,7 @@ It can be used, for example, to check your handling of disallowing multiple form
 (e/double-click driver {:tag :button :name "submit"})
 ----
 
-There are also "blind" clicking functions.
-They trigger mouse clicks on the current mouse position:
-
-[source,clojure]
-----
-(e/left-click driver)
-(e/middle-click driver)
-(e/right-click driver)
-----
-
-Another set of functions do the same but move the mouse pointer to a specified element before clicking on them:
+Functions that move the mouse pointer to a specified element before clicking on it:
 
 [source,clojure]
 ----
@@ -1575,7 +1565,7 @@ The `:eager` option only works with Firefox at the moment.
 
 Etaoin supports link:{actions}[Webdriver Actions].
 They are described as "virtual input devices".
-They act as little device input scripts that run simultaneously.
+They act as little device input scripts that can even be run simultaneously.
 
 Here, in raw form, we have an example of two actions.
 One controls the keyboard, the other the pointer (mouse).
@@ -2315,6 +2305,8 @@ From least to most verbose:
 * `:debug`
 * `:all` for all messages.
 
+Applies to Chrome and Edge only.
+
 See <<console-logs>>
 
 [id=opt-driver-log-level,reftext=`:driver-log-level`]
@@ -2473,9 +2465,9 @@ _Default:_ <not set>
 
 _Example:_ See <<http-proxy>> for an example usage.
 
-A *WebDriver*'s capabilities can be vendor specific and define preferred options.
+A *WebDriver*'s capabilities can be vendor-specific and define preferred options.
 Read WebDriver vendor docs before setting anything here.
-While reading docs, note that Etaoin passes along `:capabilities` as `desiredCapabilties`.
+While reading docs, note that Etaoin passes along `:capabilities` under `firstMatch`.
 
 === Using Headless Drivers [[headless]]
 
@@ -2489,7 +2481,7 @@ Running without a UI is helpful when:
 Ensure your browser supports headless mode by checking if it accepts `--headless` command-line argument when running it from the terminal.
 
 When starting a driver, pass the `:headless` boolean flag to switch into headless mode.
-This flag is ignored for Safari which, as of June 2022, still does not support headless mode.
+This flag is ignored for Safari which, as of August 2024, still does not support headless mode.
 
 //{:test-doc-blocks/test-ns user-guide-headless-test}
 [source,clojure]
@@ -2566,7 +2558,7 @@ To specify a directory where the browser should download files, use the `:downlo
 ----
 
 Now, when you click on a download link, the file will be saved to that folder.
-Currently, only Chrome and Firefox are supported.
+Currently, only Chrome, Edge and Firefox are supported.
 
 Firefox requires specifying MIME-types of the files that should be downloaded without showing a system dialog.
 By default, when the `:download-dir` parameter is passed, the library adds the most common MIME-types: archives, media files, office documents, etc.
@@ -2598,7 +2590,7 @@ Set a custom `User-Agent` header with the `:user-agent` option when creating a d
 ----
 
 Setting this header is important when using <<headless,headless browsers>> as many websites implement some sort of blocking when the User-Agent includes the "headless" string.
-This can lead to 403 response or some weird behavior of the site.
+This can lead to 403 responses or some weird behavior of the site.
 
 === HTTP Proxy [[http-proxy]]
 
@@ -2622,7 +2614,7 @@ To set proxy settings use environment variables `HTTP_PROXY`/`HTTPS_PROXY` or pa
 NOTE: A `:pac-url` is for a https://en.wikipedia.org/wiki/Proxy_auto-config#The_PAC_File[proxy autoconfiguration file].
 Used with Safari as other proxy options do not work in Safari.
 
-To fine tune the proxy you use the original https://www.w3.org/TR/webdriver/#proxy[object] and pass it to capabilities:
+To fine tune the proxy you use the original https://www.w3.org/TR/webdriver/#proxy[object] and pass it as capabilities:
 
 //:test-doc-blocks/skip
 [source,clojure]
diff --git a/doc/02-developer-guide.adoc b/doc/02-developer-guide.adoc
index fcbeba2..4559a69 100644
--- a/doc/02-developer-guide.adoc
+++ b/doc/02-developer-guide.adoc
@@ -237,6 +237,20 @@ Run `bb cljdoc-preview --help` for help.
 * `bb cljdoc-preview view` opens a view to your imported docs in your default web browser
 * `bb cljdoc-preview stop` stops the docker image
 
+=== Test Coverage
+Sometimes it's nice to get an idea of what parts of Etaoin its unit and doc tests (or more importantly, don't) cover.
+
+[source,shell]
+----
+bb test-coverage
+----
+
+The intent is not to strive for some percentage of coverage, just information on what is not covered.
+
+When possible, run from macOS, the only OS where we hit all supported browsers (you'll need all browsers and WebDrivers installed and up to date).
+
+It will take a while, but after tests are complete, crack open `./target/clofidence/index.html` for results.
+
 == Other Notes
 
 === Logging
diff --git a/env/test/resources/static/test.html b/env/test/resources/static/test.html
index 837d1a8..43b86b4 100644
--- a/env/test/resources/static/test.html
+++ b/env/test/resources/static/test.html
@@ -6,16 +6,16 @@
     </head>
     <body>
 
-
         <h3>Click section</h3>
         <script>
             function fill() {
                 document.getElementById("baz").innerHTML = "clicked";
             }
-        </script>
+
+       </script>
         <button id="foo" onclick="fill()">Click me</button>
         <span id="baz"></span>
-        <hr>
+       <hr>
 
         <h3>CSS section</h3>
         <style>
@@ -257,7 +257,48 @@ <h3>Shadow DOM</h3>
             </template>
         </div>
 
+        <hr>
+
+        <h3>Pointer Click Target</h3>
+        <div id="pointerClickTarget" style="border: 1px solid black;">
+            [not clicked]
+        </div>
+
+        <h3>Mouse Button State</h3>
+        <pre id="mouseButtonState">[no clicks yet]</pre>
+
         <h3 id="document-end">Document end</h3>
+        <script>
+            // Mouse button state, taken from:
+            // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons
+            const buttonNames = ["left", "right", "wheel", "back", "forward"];
+            function mouseButtonPressed(event, buttonName) {
+               // Use binary `&` with the relevant power of 2 to check if a given button is pressed
+               return Boolean(event.buttons & (1 << buttonNames.indexOf(buttonName)));
+            }
 
+            function format(event) {
+              const { type, buttons } = event;
+              const obj = { type };
+              for (const buttonName of buttonNames) {
+                obj[buttonName] = mouseButtonPressed(event, buttonName);
+              }
+              return JSON.stringify(obj, null, 2);
+            }
+
+            const log = document.getElementById("log");
+            function logButtons(event) {
+              // Avoid interfering with form elements
+              mouseButtonState.textContent = format(event);
+            }
+            document.addEventListener("mouseup", logButtons);
+            document.addEventListener("mousedown", logButtons);
+
+            // pointer click target
+            const pointerClickTarget = document.getElementById("pointerClickTarget");
+            pointerClickTarget.addEventListener("dblclick", (e) => {
+                pointerClickTarget.textContent = "[double clicked]";
+            });
+        </script>
     </body>
 </html>
diff --git a/script/test_coverage.clj b/script/test_coverage.clj
new file mode 100644
index 0000000..97700a9
--- /dev/null
+++ b/script/test_coverage.clj
@@ -0,0 +1,17 @@
+(ns test-coverage
+  (:require [babashka.fs :as fs]
+            [helper.shell :as shell]
+            [lread.status-line :as status]))
+
+(defn generate-doc-tests []
+  (status/line :head "Generating tests for code blocks in documents")
+  (shell/command "clojure -X:test-doc-blocks gen-tests"))
+
+(defn run-all-tests []
+  (status/line :head "Running unit and code block tests under Clojure for coverage report")
+  (shell/command "clojure" "-X:test:test-docs:clofidence"))
+
+(defn -main [& _args]
+  (fs/delete-tree "./target/clofidence")
+  (generate-doc-tests)
+  (run-all-tests))
diff --git a/src/etaoin/api.clj b/src/etaoin/api.clj
index c5037d4..8a40a35 100644
--- a/src/etaoin/api.clj
+++ b/src/etaoin/api.clj
@@ -38,7 +38,7 @@
   - [[get-element-text]] [[get-element-text-el]] [[has-text?]]
   - [[get-element-inner-html]] [[get-element-inner-html-el]]
   - [[get-element-value]] [[get-element-value-el]]
-  - [[get-element-size]] [[get-element-size-el]] [[get-element-location]] [[get-element-location-el]] [[get-element-box]] [[intersects?]]
+  - [[get-element-rect]] [[get-element-rect-el]] [[get-element-size]] [[get-element-size-el]] [[get-element-location]] [[get-element-location-el]] [[get-element-box]] [[intersects?]]
   - [[use-css]] [[with-css]] [[use-xpath]] [[with-xpath]]
 
   **Browser Navigation**
@@ -48,13 +48,10 @@
 
   **Mouse/Pointer**
   - [[click]] [[click-el]] [[click-single]] [[click-multi]]
-  - [[left-click]] [[left-click-on]]
-  - [[middle-click]] [[middle-click-on]]
-  - [[right-click]] [[right-click-on]]
-  - [[mouse-click]] [[mouse-move-to]] [[mouse-click-on]]
+  - [[left-click-on]] [[middle-click-on]] [[right-click-on]] [[mouse-click-on]]
   - [[double-click]] [[double-click-el]]
   - [[drag-and-drop]] [[mouse-btn-down]] [[mouse-btn-up]]
-  - [[touch-down]] [[touch-move]] [[touch-tap]] [[touch-up]]
+  - [[touch-tap]]
 
   **Inputs/Forms**
   - [[fill]] [[fill-active]] [[fill-el]] [[fill-multi]]
@@ -88,6 +85,7 @@
 
   **Browser Windows**
   - [[get-window-handle]] [[get-window-handles]]
+  - [[get-window-rect]] [[set-window-rect]]
   - [[get-window-position]] [[set-window-position]]
   - [[get-window-size]] [[set-window-size]]
   - [[maximize]]
@@ -124,6 +122,7 @@
   - [[wait-running]]
 
   **Browser Timeouts**
+  - [[get-timeouts]] [[set-timeouts]]
   - [[get-implicit-timeout]] [[set-implicit-timeout]]
   - [[get-page-load-timeout]] [[set-page-load-timeout]]
   - [[get-script-timeout]] [[set-script-timeout]] [[with-script-timeout]]
@@ -136,7 +135,7 @@
   - [[add-pause]]
   - [[add-pointer-click]] [[add-pointer-click-el]] [[add-pointer-double-click]] [[add-pointer-double-click-el]]
   - [[add-pointer-down]] [[add-pointer-up]]
-  - [[with-pointer-btn-down]] [[with-pointer-left-btn-down]] [[with-mouse-btn]]
+  - [[with-pointer-btn-down]] [[with-pointer-left-btn-down]]
   - [[add-pointer-move]] [[add-pointer-move-to-el]]
   - [[add-pointer-cancel]]
   - [[perform-actions]] [[release-actions]]
@@ -150,6 +149,7 @@
    [cheshire.core :as json]
    [clojure.java.io :as io]
    [clojure.string :as str]
+   [clojure.set :as cset]
    [clojure.tools.logging :as log]
    [etaoin.impl.client :as client]
    [etaoin.impl.driver :as drv]
@@ -173,8 +173,7 @@
 (def ^:no-doc locator-css "css selector")
 
 (def ^{:doc "WebDriver global option defaults"} defaults-global
-  {:log-level :all
-   :locator default-locator
+  {:locator default-locator
    :webdriver-failed-launch-retries 0})
 
 (def ^{:doc "WebDriver driver type specific option defaults.
@@ -182,13 +181,21 @@
   defaults
   {:firefox {:port 4444
              :path-driver "geckodriver"}
-   :chrome  {:port 9515
-             :path-driver "chromedriver"}
+   :chrome  {:log-level :all ;; for browser
+             :port 9515
+             :path-driver "chromedriver"
+             ;; if we don't send some capabilities to chrome it will
+             ;; assume legacy mode. w3c true doesn't mean w3c spec, it means
+             ;; API that superceded the json wire protocol (iiuc)
+             :capabilities {:goog:chromeOptions {:w3c true}}}
    :safari  {:port 4445
              :path-driver "safaridriver"
              :webdriver-failed-launch-retries 4}
-   :edge    {:port 17556
-             :path-driver "msedgedriver"}})
+   :edge    {:log-level :all ;; for browser
+             :port 17556
+             :path-driver "msedgedriver"
+             ;; assume same idea as chrome (TBD)
+             :capabilities {:ms:edgeOptions {:w3c true}}}})
 
 ;;
 ;; utils
@@ -246,7 +253,9 @@
 
   Can indicate readiness to create a new session.
 
-  The return varies for different driver implementations."
+  The return varies for different driver implementations.
+
+  https://www.w3.org/TR/webdriver2/#dfn-status"
   [driver]
   (:value (execute {:driver driver
                     :method :get
@@ -257,11 +266,12 @@
 
   Opens a browser window as a side-effect (visible if not running headless).
   Further requests to this driver will be for this session.
-  Etaoin assumes one active session per driver."
+  Etaoin assumes one active session per driver.
+
+  https://www.w3.org/TR/webdriver2/#dfn-new-sessions"
   [driver & [capabilities]]
-  (let [data   (if (= (dispatch-driver driver) :safari)
-                 {:capabilities (or capabilities {})} ;; required for safari even if empty
-                 {:desiredCapabilities (or capabilities {})})
+  (let [data  {:capabilities (if capabilities {:firstMatch [capabilities]}
+                                 {})}
         result (execute {:driver driver
                          :method :post
                          :path   [:session]
@@ -273,7 +283,9 @@
   "Have `driver` delete the active session.
   Closes the browser window.
 
-  See also: [[quit]]."
+  See also: [[quit]], [[closed-window]].
+
+  https://www.w3.org/TR/webdriver2/#dfn-delete-session"
   [driver]
   (execute {:driver driver
             :method :delete
@@ -283,94 +295,51 @@
 ;; active element
 ;;
 
-(defmulti ^:private get-active-element*
+(defn- get-active-element*
   "Have `driver` return the active element on the page.
 
   An active element is the one with the current focus.
-  It was selected for example by mouse click, a keyboard (tab, arrows), or `autofocus`."
-  dispatch-driver)
+  It was selected for example by mouse click, a keyboard (tab, arrows), or `autofocus`.
 
-(defmethods get-active-element*
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-get-active-element"
   [driver]
   (-> (execute {:driver driver
                 :method :get
                 :path   [:session (:session driver) :element :active]})
       :value first second))
 
-(defmethods get-active-element*
-  [:chrome :edge]
-  [driver]
-  (-> (execute {:driver driver
-                :method :post
-                :path   [:session (:session driver) :element :active]})
-      :value
-      :ELEMENT))
-
 ;;
 ;; windows
 ;;
 
-(defmulti get-window-handle
-  "Have `driver` return the current browser window handle string."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn get-window-handle
+  "Have `driver` return the current browser window handle string.
 
-(defmethod get-window-handle :default
-  [driver]
-  (:value (execute {:driver driver
-                    :method :get
-                    :path   [:session (:session driver) :window_handle]})))
-
-(defmethods get-window-handle
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-get-window-handle"
   [driver]
   (:value (execute {:driver driver
                     :method :get
                     :path   [:session (:session driver) :window]})))
 
-(defmulti get-window-handles
-  "Have `driver` return a vector of all browser window handle strings."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn get-window-handles
+  "Have `driver` return a vector of all browser window handle strings.
 
-(defmethods get-window-handles
-  [:firefox :safari]
-  [driver]
+  https://www.w3.org/TR/webdriver2/#dfn-get-window-handles" [driver]
   (:value (execute {:driver driver
                     :method :get
                     :path   [:session (:session driver) :window :handles]})))
 
-(defmethods get-window-handles
-  [:chrome :edge]
-  [driver]
-  (:value (execute {:driver driver
-                    :method :get
-                    :path   [:session (:session driver) :window_handles]})))
+(defn switch-window
+  "Have `driver` switch to browser window with `handle`.
 
-(defmulti switch-window
-  "Have `driver` switch to browser window with `handle`."
-  {:arglists '([driver handle])}
-  dispatch-driver)
-
-(defmethod switch-window
-  :default
-  [driver handle]
+  https://www.w3.org/TR/webdriver2/#dfn-switch-to-window" [driver handle]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :window]
             :data   {:handle handle}}))
 
-(defmethods switch-window
-  [:chrome :edge]
-  [driver handle]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :window]
-            :data   {:name handle}}))
-
 (defn switch-window-next
-  "Have `driver` switch to next browser window."
+  "A convenience fn to have `driver` switch to next browser window."
   [driver]
   (let [current-handle (try
                          (get-window-handle driver)
@@ -383,150 +352,83 @@
                            (recur hs)))]
     (switch-window driver next-handle)))
 
-(defmulti close-window
-  "Have `driver` close current browser window."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn close-window
+  "Have `driver` close current browser window.
+  On last window close, closes the session.
 
-(defmethod close-window :default
-  [driver]
+  See also: [[delete-session]],[[quit]]
+
+  https://www.w3.org/TR/webdriver2/#dfn-close-window" [driver]
   (execute {:driver driver
             :method :delete
             :path   [:session (:session driver) :window]}))
 
-(defmulti maximize
-  "Have `driver` make the current browser window as large as your screen allows."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn maximize
+  "Have `driver` make the current browser window as large as your screen allows.
 
-(defmethods maximize
-  [:firefox :safari]
-  [driver]
+  https://www.w3.org/TR/webdriver2/#dfn-maximize-window" [driver]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :window :maximize]}))
 
-(defmethods maximize
-  [:chrome :edge]
-  [driver]
-  (let [h (get-window-handle driver)]
-    (execute {:driver driver
-              :method :post
-              :path   [:session (:session driver) :window h :maximize]})))
-
-(defmulti get-window-size
-  "Have `driver` return the current browser window size in pixels as a map of `:width` and `:height`."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn get-window-rect
+  "Have `driver` return the current browser window rect as map of `:x`, `:y`, `:width`, `:height`
 
-(defmethods get-window-size
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-get-window-rect"
   [driver]
   (-> (execute {:driver driver
                 :method :get
                 :path   [:session (:session driver) :window :rect]})
-      :value
-      (select-keys [:width :height])))
+      :value))
 
-(defmethod get-window-size :default
+(defn get-window-size
+  "Have `driver` return the current browser window size in pixels as a map of `:width` and `:height`.
+
+  Consider also: [[get-window-rect]]"
   [driver]
-  (let [h (get-window-handle driver)]
-    (-> (execute {:driver driver
-                  :method :get
-                  :path   [:session (:session driver) :window h :size]})
-        :value
-        (select-keys [:width :height]))))
-
-(defmulti get-window-position
+  (-> (get-window-rect driver)
+      (select-keys [:width :height])))
+
+(defn get-window-position
   "Have `driver` return the current window position, in pixels relative to the screen, as a map of
-  `:x` and `:y`."
-  {:arglists '([driver])}
-  dispatch-driver)
+  `:x` and `:y`.
 
-(defmethods get-window-position
-  [:firefox :safari]
+  Consider also: [[get-window-rect]]"
   [driver]
-  (-> (execute {:driver driver
-                :method :get
-                :path   [:session (:session driver) :window :rect]})
-      :value
+  (-> (get-window-rect driver)
       (select-keys [:x :y])))
 
-(defmethod get-window-position :default
-  [driver]
-  (let [h (get-window-handle driver)]
-    (-> (execute {:driver driver
-                  :method :get
-                  :path   [:session (:session driver) :window h :position]})
-        :value
-        (select-keys [:x :y]))))
-
-(defmulti ^:private set-window-size* dispatch-driver)
-
-(defmethod set-window-size* :firefox
-  [driver width height]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :window :size]
-            :data   {:width width :height height}}))
+(defn set-window-rect
+  "Have `driver` ase the current browser window `:width`, `:height`, `:x` and/or `:y`.
 
-(defmethod set-window-size* :safari
-  [driver width height]
+  https://www.w3.org/TR/webdriver2/#dfn-set-window-rect"
+  [driver {:keys [width height x y]}]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :window :rect]
-            :data   {:width width :height height}}))
-
-(defmethod set-window-size* :default
-  [driver width height]
-  (let [h (get-window-handle driver)]
-    (execute {:driver driver
-              :method :post
-              :path   [:session (:session driver) :window h :size]
-              :data   {:width width :height height}})))
+            :data   {:width width :height height :x x :y y}}))
 
 (defn set-window-size
   "Have `driver` set the `width` and `height` in pixels of the current window.
-  Absolute precision is not guaranteed."
+  Absolute precision is not guaranteed.
+
+  Condiser also: [[set-window-rect]]"
   ([driver {:keys [width height]}]
-   (set-window-size* driver width height))
+   (set-window-size driver width height))
   ([driver width height]
-   (set-window-size* driver width height)))
-
-(defmulti ^:private set-window-position* dispatch-driver)
-
-(defmethod set-window-position* :firefox
-  ([driver x y]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :window :position]
-             :data   {:x x :y y}})))
-
-(defmethod set-window-position* :safari
-  ([driver x y]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :window :rect]
-             :data   {:x x :y y}})))
-
-(defmethod set-window-position* :default
-  ([driver x y]
-   (let [h (get-window-handle driver)]
-     (execute {:driver driver
-               :method :post
-               :path   [:session (:session driver) :window h :position]
-               :data   {:x x :y y}}))))
+   (set-window-rect driver {:width width :height height})))
 
 (defn set-window-position
   "Have `driver` set the `x` `y` position of the current browser window.
 
   Position is in pixels and relative to your screen.
-  Absolute precision is not guaranteed."
+  Absolute precision is not guaranteed.
+
+  Condiser also: [[set-window-rect]]"
   ([driver {:keys [x y]}]
-   (set-window-position* driver x y))
+   (set-window-position driver x y))
   ([driver x y]
-   (set-window-position* driver x y)))
-
+   (set-window-rect driver {:x x :y y})))
 
 ;;
 ;; navigation
@@ -540,7 +442,9 @@
   ```Clojure
   (def ff (firefox))
   (go ff \"http://google.com\")
-  ```"
+  ```
+
+  https://www.w3.org/TR/webdriver2/#dfn-navigate-to"
   [driver url]
   (execute {:driver driver
             :method :post
@@ -548,14 +452,18 @@
             :data   {:url url}}))
 
 (defn back
-  "Have `driver` navigate backward in the browser history."
+  "Have `driver` navigate backward in the browser history.
+
+  https://www.w3.org/TR/webdriver2/#dfn-back"
   [driver]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :back]}))
 
 (defn refresh
-  "Have `driver` reload the content in the current browser window."
+  "Have `driver` reload the content in the current browser window.
+
+  https://www.w3.org/TR/webdriver2/#dfn-refresh"
   [driver]
   (execute {:driver driver
             :method :post
@@ -564,7 +472,9 @@
 (def ^{:arglists '([driver])} reload "Alias for [[refresh]]" refresh)
 
 (defn forward
-  "Have `driver` navigate forward in the browser's history."
+  "Have `driver` navigate forward in the browser's history.
+
+  https://www.w3.org/TR/webdriver2/#dfn-forward"
   [driver]
   (execute {:driver driver
             :method :post
@@ -575,14 +485,18 @@
 ;;
 
 (defn get-url
-  "Have `driver` return the current url location as a string."
+  "Have `driver` return the current url location as a string.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-current-url"
   [driver]
   (:value (execute {:driver driver
                     :method :get
                     :path   [:session (:session driver) :url]})))
 
 (defn get-title
-  "Have `driver` return the current page title."
+  "Have `driver` return the current page title.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-title"
   [driver]
   (:value (execute {:driver driver
                     :method :get
@@ -592,10 +506,7 @@
 ;; Finding element(s)
 ;;
 
-(defmulti ^:private find-element* dispatch-driver)
-
-(defmethods find-element*
-  [:firefox :safari]
+(defn- find-element*
   [driver locator term]
   (-> (execute {:driver driver
                 :method :post
@@ -605,17 +516,7 @@
       first
       second))
 
-(defmethod find-element* :default
-  [driver locator term]
-  (-> (execute {:driver driver
-                :method :post
-                :path   [:session (:session driver) :element]
-                :data   {:using locator :value term}})
-      :value :ELEMENT))
-
-(defmulti ^:no-doc find-elements* dispatch-driver)
-
-(defmethod find-elements* :default
+(defn ^:no-doc find-elements*
   [driver locator term]
   (->> (execute {:driver driver
                  :method :post
@@ -624,10 +525,7 @@
        :value
        (mapv (comp second first))))
 
-(defmulti ^:private find-element-from* dispatch-driver)
-
-(defmethods find-element-from*
-  [:firefox :safari]
+(defn- find-element-from*
   [driver el locator term]
   {:pre [(some? el)]}
   (-> (execute {:driver driver
@@ -638,19 +536,7 @@
       first
       second))
 
-(defmethod find-element-from* :default
-  [driver el locator term]
-  {:pre [(some? el)]}
-  (-> (execute {:driver driver
-                :method :post
-                :path   [:session (:session driver) :element el :element]
-                :data   {:using locator :value term}})
-      :value
-      :ELEMENT))
-
-(defmulti ^:private find-elements-from* dispatch-driver)
-
-(defmethod find-elements-from* :default
+(defn- find-elements-from*
   [driver el locator term]
   {:pre [(some? el)]}
   (->> (execute {:driver driver
@@ -688,7 +574,11 @@
 
    Returns the found element's unique identifier, or throws when not found.
 
-   See [Selecting Elements](/doc/01-user-guide.adoc#querying) for more details."
+   See [Selecting Elements](/doc/01-user-guide.adoc#querying) for more details.
+
+  Makes use of:
+  - https://www.w3.org/TR/webdriver2/#dfn-get-active-element
+  - https://www.w3.org/TR/webdriver2/#dfn-find-element-from-element"
   ([driver q]
    (cond
 
@@ -711,7 +601,11 @@
 (defn query-all
   "Use `driver` to return a vector of all elements on current page matching `q`.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  Makes use of:
+  - https://www.w3.org/TR/webdriver2/#dfn-find-elements
+  - https://www.w3.org/TR/webdriver2/#dfn-find-elements-from-element"
   ([driver q]
    (cond
 
@@ -734,7 +628,11 @@
 
   See [[query]] for details on `q`.
 
-  See [User Guide](/doc/01-user-guide.adoc#query-tree) for an example."
+  See [User Guide](/doc/01-user-guide.adoc#query-tree) for an example.
+
+  Makes use of:
+  - https://www.w3.org/TR/webdriver2/#dfn-find-elements
+  - https://www.w3.org/TR/webdriver2/#dfn-find-elements-from-element"
   [driver q & qs]
   (reduce (fn [elements q]
             (let [[loc term] (query/expand driver q)]
@@ -748,7 +646,9 @@
 (defn child
   "Uses `driver` to return single element satisfying query `q` under given `ancestor-el` element.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  https://www.w3.org/TR/webdriver2/#dfn-find-element-from-element"
   [driver ancestor-el q]
   {:pre [(some? ancestor-el)]}
   (let [[loc term] (query/expand driver q)]
@@ -757,7 +657,9 @@
 (defn children
   "Use `driver` to return a vector of unique elements satisfying query `q` under given `ancestor-el` element.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  https://www.w3.org/TR/webdriver2/#find-elements-from-element"
   [driver ancestor-el q]
   {:pre [(some? ancestor-el)]}
   (let [[loc term] (query/expand driver q)]
@@ -778,28 +680,28 @@
   {:type (name type) :id (rand-uuid) :actions []})
 
 (defn make-pointer-input
-  "Return a new pointer input source of pointer `type`."
+  "Return a new action pointer input source of pointer `type`."
   [type]
   (-> (make-action-input :pointer)
       (assoc-in [:parameters :pointerType] type)))
 
 (defn make-mouse-input
-  "Return a new mouse input source."
+  "Return a new action mouse input source."
   []
   (make-pointer-input :mouse))
 
 (defn make-touch-input
-  "Return a new touch input source."
+  "Return a new action touch input source."
   []
   (make-pointer-input :touch))
 
 (defn make-pen-input
-  "Return a new pen input source."
+  "Return a new action pen input source."
   []
   (make-pointer-input :pen))
 
 (defn make-key-input
-  "Return a new key input source."
+  "Return a new action key input source."
   []
   (make-action-input :key))
 
@@ -961,108 +863,37 @@
        ~@body
        add-pointer-up))
 
-(defmulti perform-actions
-  "Have `driver` perform actions defined in `input` source(s) simultaneously.
+(defn perform-actions
+ "Have `driver` perform actions defined in `input` source(s) simultaneously.
 
-  See [Actions](/doc/01-user-guide.adoc#actions) for more details."
-  {:arglists '([driver input & inputs])}
-  dispatch-driver)
+  See [Actions](/doc/01-user-guide.adoc#actions) for more details.
 
-(defmethod perform-actions
-  :default
+  https://www.w3.org/TR/webdriver2/#dfn-perform-actions"
   [driver input & inputs]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :actions]
             :data   {:actions (cons input inputs)}}))
 
-(defmulti release-actions
-  "Have `driver` clear any active action state.
-  This includes any key presses and/or a pointer button being held down."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn release-actions
+ "Have `driver` clear any active action state.
+  This includes any key presses and/or a pointer button being held down.
 
-(defmethod release-actions
-  :default
+  https://www.w3.org/TR/webdriver2/#release-actions"
   [driver]
   (execute {:driver driver
             :method :delete
             :path   [:session (:session driver) :actions]}))
 
-;;
-;; mouse
-;;
-
-(defmulti mouse-btn-down
-  "Have `driver` press down on the button of the virtual mouse."
-  {:arglists '([driver])}
-  dispatch-driver)
-
-(defmethods mouse-btn-down
-  [:chrome :edge]
-  [driver]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :buttondown]}))
-
-(defmulti mouse-btn-up
-  "Have `driver` release button of the virtual mouse."
-  {:arglists '([driver])}
-  dispatch-driver)
-
-(defmethods mouse-btn-up
-  [:chrome :edge]
-  [driver]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :buttonup]}))
-
-(defmulti mouse-move-to
-  "Have `driver` moves the virtual mouse pointer either to an element found by query `q`
-  or to a specific by `x` and `y` pixel offset within the browser window."
-  {:arglists '([driver q] [driver x y])}
-  dispatch-driver)
-
-(defmethods mouse-move-to
-  [:chrome :edge :firefox]
-  ([driver q]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :moveto]
-             :data   {:element (query driver q)}}))
-  ([driver x y]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :moveto]
-             :data   {:xoffset x :yoffset y}})))
-
-(defmacro with-mouse-btn
-  "Have `driver` press the virtual mouse button, execute `body`, then release the virtual mouse button."
-  [driver & body]
-  `(do
-     (mouse-btn-down ~driver)
-     (try
-       ~@body
-       (finally
-         (mouse-btn-up ~driver)))))
-
-(defmulti drag-and-drop
-  "Have `driver` perform a drag and drop from element found by `q-from` to element found by `q-to`:
+(defn drag-and-drop
+ "Have `driver` perform a drag and drop from element found by `q-from` to element found by `q-to`:
 
   1. moves mouse pointer to an element found with `q-from` query;
   2. holds down the mouse button;
   3. moves mouse to an element found with `q-to` query;
   4. releases the mouse button.
 
-  See [[query]] for details on `q-from`, `q-to`.
-
-  Notes:
-  - does not work in Safari."
-  {:arglists '([driver q-from q-to])}
-  dispatch-driver)
-
-(defmethod drag-and-drop
-  :default
+  See [[query]] for details on `q-from`, `q-to`."
   [driver q-from q-to]
   (let [el-from (query driver q-from)
         el-to   (query driver q-to)
@@ -1087,7 +918,9 @@
 (defn click
   "Have `driver` click on element found by query `q`.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  https://www.w3.org/TR/webdriver2/#dfn-element-click"
   [driver q]
   (click-el driver (query driver q)))
 
@@ -1119,17 +952,8 @@
 
 ;; Double click
 
-(defmulti double-click-el
-  "Have `driver` double-click on element `el`.
-
-  Note:
-  - supported by Chrome
-  - for Firefox and Safari, your may try to simulate via a `click, wait, click` sequence."
-  {:arglists '([driver el])}
-  dispatch-driver)
-
-(defmethod double-click-el
-  :default
+(defn double-click-el
+ "Have `driver` double-click on element `el`."
   [driver el]
   {:pre [(some? el)]}
   (let [mouse   (-> (make-mouse-input)
@@ -1142,64 +966,20 @@
 (defn double-click
   "Have `driver` double-click on element found by query `q`.
 
-  See [[query]] for details on `q`.
-
-  Note:
-  - supported by Chrome
-  - for Firefox and Safari, your may try to simulate via a `click, wait, click` sequence."
+  See [[query]] for details on `q`."
   [driver q]
   (double-click-el driver (query driver q)))
 
-
-;; Blind click
-
-(defmulti mouse-click
-  "Have `driver` click `mouse-button` at current mouse pointer position.
-
-  `mouse-button` should be `etaoin.keys/mouse-left`,`etaoin.keys/mouse-middle` or `etaoin.keys/mouse-right`."
-  {:arglists '([driver mouse-button])}
-  dispatch-driver)
-
-(defmethod mouse-click
-  :default
-  [driver mouse-button]
-  (let [{driver-type :type} driver]
-    (throw (ex-info "Mouse click is not supported for that browser"
-                    {:button      mouse-button
-                     :driver-type driver-type}))))
-
-(defmethod mouse-click
-  :chrome ;; TODO: try safari once the issue with it is solved
-  [driver mouse-button]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :click]
-            :data   {:button mouse-button}}))
-
-(defn left-click
-  "Have `driver` click the left mouse button at current mouse pointer position."
-  [driver]
-  (mouse-click driver k/mouse-left))
-
-(defn right-click
-  "Have `driver` click the right mouse button at current mouse pointer position."
-  [driver]
-  (mouse-click driver k/mouse-right))
-
-(defn middle-click
-  "Have `driver` click the middle mouse button at current mouse pointer position."
-  [driver]
-  (mouse-click driver k/mouse-middle))
-
 (defn mouse-click-on
   "Have `driver` move mouse pointer to element found by `q` then click `mouse-button`.
 
   - `mouse-button` should be `etaoin.keys/mouse-left`,`etaoin.keys/mouse-middle` or `etaoin.keys/mouse-right`.
   - `q` see [[query]] for details."
   [driver btn q]
-  (doto driver
-    (mouse-move-to q)
-    (mouse-click btn)))
+  (let [mouse (-> (make-mouse-input)
+                  (add-pointer-move-to-el (query driver q))
+                  (add-pointer-click btn))]
+    (perform-actions driver mouse)))
 
 (defn left-click-on
   "Have `driver` move mouse pointer to element found by `q` then click left mouse button.
@@ -1228,35 +1008,38 @@
 ;; Element size
 ;;
 
-(defmulti get-element-size-el
-  "Have `driver` return map of `:width` and `:height`, in pixels, of element `el`."
-  {:arglists '([driver el])}
-  dispatch-driver)
+(defn get-element-rect-el
+  "Have `driver` return map of `:width`, `:height`, `:x` and `:y`, in pixels, of element `el`.
 
-(defmethods get-element-size-el
-  [:chrome :edge]
+  https://www.w3.org/TR/webdriver2/#dfn-get-element-rect"
   [driver el]
-  {:pre [(some? el)]}
   (-> (execute {:driver driver
                 :method :get
-                :path   [:session (:session driver) :element el :size]})
-      :value
-      (select-keys [:width :height])))
+                :path   [:session (:session driver) :element el :rect]})
+      :value))
+
+(defn get-element-rect
+  "Have `driver` return map of `:width`, `:height`, `:x` and `:y`, in pixels, of element found by query `q`.
+
+  See [[query]] for details on `q`."
+  [driver q]
+  (get-element-rect-el driver (query driver q)))
+
+(defn get-element-size-el
+  "Have `driver` return map of `:width` and `:height`, in pixels, of element `el`.
 
-(defmethods get-element-size-el
-  [:firefox :safari]
+  Consider also: [[get-element-rect-el]]"
   [driver el]
   {:pre [(some? el)]}
-  (-> (execute {:driver driver
-                :method :get
-                :path   [:session (:session driver) :element el :rect]})
-      :value
+  (-> (get-element-rect-el driver el)
       (select-keys [:width :height])))
 
 (defn get-element-size
   "Have `driver` return map of `:width` and `:height`, in pixels, of element found by query `q`.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  Consider also: [[get-element-rect]]"
   [driver q]
   (get-element-size-el driver (query driver q)))
 
@@ -1264,35 +1047,21 @@
 ;; element location
 ;;
 
-(defmulti get-element-location-el
-  "Have `driver` return map of `:x` `:y` offset, in pixels of element `el`."
-  {:arglists '([driver el])}
-  dispatch-driver)
+(defn get-element-location-el
+ "Have `driver` return map of `:x` `:y` offset, in pixels of element `el`.
 
-(defmethods get-element-location-el
-  [:chrome :edge]
+  Consider also: [[get-element-rect-el]]"
   [driver el]
   {:pre [(some? el)]}
-  (-> (execute {:driver driver
-                :method :get
-                :path   [:session (:session driver) :element el :location]})
-      :value
-      (select-keys [:x :y])))
-
-(defmethods get-element-location-el
-  [:firefox :safari]
-  [driver el]
-  {:pre [(some? el)]}
-  (-> (execute {:driver driver
-                :method :get
-                :path   [:session (:session driver) :element el :rect]})
-      :value
+  (-> (get-element-rect-el driver el)
       (select-keys [:x :y])))
 
 (defn get-element-location
   "Have `driver` return map of `:x` `:y` offset, in pixels of element found by query `q`.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  Consider also: [[get-element-rect]]"
   [driver q]
   (get-element-location-el driver (query driver q)))
 
@@ -1314,9 +1083,7 @@
   - `:width`: width as a difference b/w `:x2` and `:x1`;
   - `:height`: height as a difference b/w `:y2` and `:y1`. "
   [driver q]
-  (let [el                     (query driver q)
-        {:keys [width height]} (get-element-size-el driver el)
-        {:keys [x y]}          (get-element-location-el driver el)]
+  (let [{:keys [width height x y]} (get-element-rect driver q)]
     {:x1     x
      :x2     (+ x width)
      :y1     y
@@ -1342,7 +1109,11 @@
 ;;
 
 (defn get-element-property-el
-  "Have `driver` return value for `property` of element `el`."
+  "Have `driver` return value for `property` of element `el`.
+
+  -`property` examples: `:innerHTML`, `:outerHTML`, etc
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-element-property"
   [driver el property]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
@@ -1352,10 +1123,12 @@
 (defn get-element-property
   "Have `driver` value for  `property` of element found by query `q`.
 
+  -`property` examples: `:innerHTML`, `:outerHTML`, etc
+
   Found property value is returned as string.
   When element is found but property is absent, returns `nil`.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`. "
   [driver q property]
   (get-element-property-el driver (query driver q) property))
 
@@ -1365,6 +1138,8 @@
   Found property values are returned as strings.
   When element is found but property is absent, result is included in vector as `nil`.
 
+  See also: [[get-element-property]]
+
   See [[query]] for details on `q`."
   [driver q & properties]
   (let [el (query driver q)]
@@ -1377,7 +1152,9 @@
 ;;
 
 (defn get-element-attr-el
-  "Have `driver` return value for `attribute` of element `el`, or `nil` if attribute does not exist."
+  "Have `driver` return value for `attribute` of element `el`, or `nil` if attribute does not exist.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-element-attribute"
   [driver el attribute]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
@@ -1423,7 +1200,9 @@
 ;;
 
 (defn get-element-css-el
-  "Have `driver` return value for CSS style `property` of element `el`, or `nil` if property does not exist."
+  "Have `driver` return value for CSS style `property` of element `el`, or `nil` if property does not exist.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-element-css-value"
   [driver el property]
   {:pre [(some? el)]}
   (-> (execute {:driver driver
@@ -1457,7 +1236,6 @@
   [driver q property]
   (get-element-css-el driver (query driver q) property))
 
-
 (defn get-element-csss
   "Have `driver` return CSS style properties matching `properties` of element found by query `q`.
 
@@ -1484,21 +1262,16 @@
 ;;
 ;; element inner HTML
 ;;
-(defmulti get-element-inner-html-el
+(defn get-element-inner-html-el
   "Have `driver` return inner text of element `el`.
 
   For element with `my-id` in `<div id=\"my-id\"><p class=\"foo\">hello</p></div>` return will be
-  `\"<p class=\"foo\">hello</p>\"`."
-  {:arglists '([driver el])}
-  dispatch-driver)
+  `\"<p class=\"foo\">hello</p>\"`.
 
-(defmethod get-element-inner-html-el
-  :default
+  See also: [[get-element-property-el]]"
   [driver el]
   {:pre [(some? el)]}
-  (:value (execute {:driver driver
-                    :method :get
-                    :path   [:session (:session driver) :element el :property :innerHTML]})))
+  (get-element-property-el driver el :innerHTML))
 
 (defn get-element-inner-html
   "Have `driver` return inner text of element found by query `q`.
@@ -1506,7 +1279,9 @@
   See [[query]] for details on `q`.
 
   For element with `my-id` in `<div id=\"my-id\"><p class=\"foo\">hello</p></div>` return will be
-  `\"<p class=\"foo\">hello</p>\"`."
+  `\"<p class=\"foo\">hello</p>\"`.
+
+  See also: [[get-element-property]]"
   [driver q]
   (get-element-inner-html-el driver (query driver q)))
 
@@ -1515,7 +1290,9 @@
 ;;
 
 (defn get-element-tag-el
-  "Have `driver` return tag name of element `el`."
+  "Have `driver` return tag name of element `el`.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-element-tag-name"
   [driver el]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
@@ -1532,7 +1309,9 @@
 (defn get-element-text-el
   "Have `driver` return text of element `el`.
 
-  Text return for `<p class=\"foo\">hello</p>` is  `\"hello\"`."
+  Text return for `<p class=\"foo\">hello</p>` is  `\"hello\"`.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-element-text"
   [driver el]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
@@ -1558,29 +1337,20 @@
   To be used on input elements."
   [driver el]
   {:pre [(some? el)]}
-  (:value (execute {:driver driver
-                    :method :get
-                    :path   [:session (:session driver) :element el :value]})))
+  (get-element-property-el driver el :value))
 
-(defmulti get-element-value
+;; this is the way to go for all
+(defn get-element-value
   "Have `driver` return the value of element found by query `q`.
 
   To be used on input elements.
 
   See [[query]] for details on `q`."
-  {:arglists '([driver q])}
-  dispatch-driver)
-
-(defmethod get-element-value
-  :default
   [driver q]
   (get-element-value-el driver (query driver q)))
 
-(defmethods get-element-value
-  [:firefox :safari]
-  [driver q]
-  (get-element-property driver q :value))
 
+;; TODO: Dev Doc: Why not: /session/{session id}/element/{element id}/shadow from w3c spec?
 (defn get-element-shadow-root-el
   "Returns the shadow root for the specified element or `nil` if the
   element does not have a shadow root."
@@ -1601,10 +1371,7 @@
 ;;; Shadow root queries
 ;;; 
 
-(defmulti ^:private find-element-from-shadow-root* dispatch-driver)
-
-(defmethods find-element-from-shadow-root*
-  [:firefox :safari]
+(defn- find-element-from-shadow-root*
   [driver shadow-root-el locator term]
   {:pre [(some? shadow-root-el)]}
   (-> (execute {:driver driver
@@ -1615,19 +1382,7 @@
       first
       second))
 
-(defmethod find-element-from-shadow-root* :default
-  [driver shadow-root-el locator term]
-  {:pre [(some? shadow-root-el)]}
-  (-> (execute {:driver driver
-                :method :post
-                :path   [:session (:session driver) :shadow shadow-root-el :element]
-                :data   {:using locator :value term}})
-      :value
-      :ELEMENT))
-
-(defmulti ^:private find-elements-from-shadow-root* dispatch-driver)
-
-(defmethod find-elements-from-shadow-root* :default
+(defn- find-elements-from-shadow-root*
   [driver shadow-root-el locator term]
   {:pre [(some? shadow-root-el)]}
   (->> (execute {:driver driver
@@ -1643,7 +1398,9 @@
 
   The `shadow-q` parameter is similar to the `q` parameter of
   the [[query]] function, but some drivers may limit it to specific
-  formats (e.g., CSS). See [this note](/doc/01-user-guide.adoc#shadow-root-browser-limitations) for more information."
+  formats (e.g., CSS). See [this note](/doc/01-user-guide.adoc#shadow-root-browser-limitations) for more information.
+
+  https://www.w3.org/TR/webdriver2/#dfn-find-element-from-shadow-root"
   [driver shadow-root-el shadow-q]
   (let [[loc term] (query/expand driver shadow-q)]
     (find-element-from-shadow-root* driver shadow-root-el loc term)))
@@ -1654,7 +1411,9 @@
 
   The `shadow-q` parameter is similar to the `q` parameter of
   the [[query]] function, but some drivers may limit it to specific
-  formats (e.g., CSS). See [this note](/doc/01-user-guide.adoc#shadow-root-browser-limitations) for more information."
+  formats (e.g., CSS). See [this note](/doc/01-user-guide.adoc#shadow-root-browser-limitations) for more information.
+
+  https://www.w3.org/TR/webdriver2/#dfn-find-elements-from-shadow-root"
   [driver shadow-root-el shadow-q]
   (let [[loc term] (query/expand driver shadow-q)]
     (find-elements-from-shadow-root* driver shadow-root-el loc term)))
@@ -1702,7 +1461,9 @@
    :expiry nil,
    :secure false,
    :httpOnly false}
-  ```"
+  ```
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-all-cookies"
   [driver]
   (:value (execute {:driver driver
                     :method :get
@@ -1713,6 +1474,8 @@
 
   When `cookie-name` is a keyword it will be converted appropriately."
   [driver cookie-name]
+  ;; We don't use w3c GET /session/{session id}/cookie/{name}
+  ;; because it is easier this way support keyword translation
   (->> driver
        get-cookies
        (filter #(= (:name %) (name cookie-name)))
@@ -1722,7 +1485,9 @@
   "Have `driver` set a `cookie`.
 
   `cookie` is a map with structure described in [[get-cookies]].
-  At least `:name` and `:value` keys should be populated."
+  At least `:name` and `:value` keys should be populated.
+
+  https://www.w3.org/TR/webdriver2/#dfn-adding-a-cookie"
   [driver cookie]
   (execute {:driver driver
             :method :post
@@ -1730,27 +1495,31 @@
             :data   {:cookie cookie}}))
 
 (defn delete-cookie
-  "Have `driver` delete cookie with cookie `cookie-name`."
+  "Have `driver` delete cookie with cookie `cookie-name`.
+
+  https://www.w3.org/TR/webdriver2/#dfn-delete-cookie"
   [driver cookie-name]
   (execute {:driver driver
             :method :delete
             :path   [:session (:session driver) :cookie (name cookie-name)]}))
 
 (defmulti delete-cookies
-  "Have `driver` delete all browser cookies for all domains."
+  "Have `driver` delete all browser cookies for all domains.
+
+  https://www.w3.org/TR/webdriver2/#dfn-delete-all-cookies"
   {:arglists '([driver])}
   dispatch-driver)
 
-(defmethod delete-cookies :default
+(defmethod delete-cookies
+  :default
   [driver]
   (execute {:driver driver
             :method :delete
             :path   [:session (:session driver) :cookie]}))
 
-;; TODO test & delete
-(defmethod delete-cookies :safari
-  ;; For some reason, Safari hangs forever when trying to delete
-  ;; all cookies. Currently we delete them in cycle.
+(defmethod delete-cookies
+  :safari
+  ;; Compensate for Safari delete-cookies currently being no-op (last checked: 2024-08-08)
   [driver]
   (doseq [cookie (get-cookies driver)]
     (delete-cookie driver (:name cookie))))
@@ -1760,7 +1529,9 @@
 ;;
 
 (defn get-source
-  "Have `driver` return browser's current page HTML markup as a string."
+  "Have `driver` return browser's current page HTML markup as a string.
+
+  https://www.w3.org/TR/webdriver2/#dfn-get-page-source"
   [driver]
   (:value (execute {:driver driver
                     :method :get
@@ -1789,7 +1560,7 @@
   {:ELEMENT                             el
    :element-6066-11e4-a52e-4f735466cecf el})
 
-(defmulti js-execute
+(defn js-execute
   "Return result of `driver` executing Javascript `script` with `args` synchronously in the browser.
 
   The script is sent as a string (can be multi-line). Under the hood,
@@ -1814,26 +1585,15 @@
   (def driver (chrome))
   (js-execute driver \"return arguments[0] + 1;\" 42)
   ;; => 43
-  ```"
-  {:arglists '([driver script & args])}
-  dispatch-driver)
-
-(defmethod js-execute :default
-  [driver script & args]
-  (:value (execute {:driver driver
-                    :method :post
-                    :path   [:session (:session driver) :execute]
-                    :data   {:script script :args (vec args)}})))
-
-(defmethods js-execute
-  [:firefox :safari]
+  ```
+  https://www.w3.org/TR/webdriver2/#dfn-execute-script"
   [driver script & args]
   (:value (execute {:driver driver
                     :method :post
                     :path   [:session (:session driver) :execute :sync]
                     :data   {:script script :args (vec args)}})))
 
-(defmulti js-async
+(defn js-async
   "Return result of `driver` executing JavaScript `script` with `args` asynchornously in the browser.
 
   Executes an asynchronous script in the browser and returns the result.
@@ -1867,20 +1627,8 @@
       callback({error: getErrorData(result)});
     }
   }});
-  ```"
-  {:arglists '([driver script & args])}
-  dispatch-driver)
-
-(defmethod js-async :default
-  [driver script & args]
-  (:value (execute {:driver driver
-                    :method :post
-                    :path   [:session (:session driver) :execute_async]
-                    :data   {:script script :args (vec args)}})))
-
-(defmethod js-async
-  [:firefox :safari]
-  [driver script & args]
+  ```
+  https://www.w3.org/TR/webdriver2/#dfn-execute-async-script" [driver script & args]
   (:value (execute {:driver driver
                     :method :post
                     :path   [:session (:session driver) :execute :async]
@@ -2022,7 +1770,9 @@
 (defn switch-frame
   "Have `driver` switch context to (i)frame element found by query `q`.
 
-  See [[query]] for details on `q`."
+  See [[query]] for details on `q`.
+
+  https://www.w3.org/TR/webdriver2/#dfn-switch-to-frame"
   [driver q]
   (let [el (query driver q)]
     (switch-frame* driver (el->ref el))))
@@ -2033,7 +1783,9 @@
   (switch-frame* driver 0))
 
 (defn switch-frame-parent
-  "Have `driver` switch context to the parent of the current (i)frame."
+  "Have `driver` switch context to the parent of the current (i)frame.
+
+  https://www.w3.org/TR/webdriver2/#dfn-switch-to-parent-frame"
   [driver]
   (execute {:driver driver
             :method :post
@@ -2061,16 +1813,18 @@
 ;;
 
 (defmulti get-log-types
-  "Have `driver` return a vector of log types the browser supports."
+  "Have `driver` return a vector of log types the browser supports.
+
+  Chrome/Edge specific extension"
   {:arglists '([driver])}
   dispatch-driver)
 
 (defmethods get-log-types
-  [:chrome]
+  [:chrome :edge]
   [driver]
   (:value (execute {:driver driver
                     :method :get
-                    :path   [:session (:session driver) :log :types]})))
+                    :path   [:session (:session driver) :se :log :types]})))
 
 (defn ^:no-doc process-log
   "Remaps some of the log's fields."
@@ -2085,11 +1839,11 @@
   dispatch-driver)
 
 (defmethods get-logs*
-  [:chrome]
+  [:chrome :edge]
   [driver logtype]
   (->> (execute {:driver driver
                  :method :post
-                 :path   [:session (:session driver) :log]
+                 :path   [:session (:session driver) :se :log]
                  :data   {:type logtype}})
        :value
        (mapv process-log)))
@@ -2111,7 +1865,9 @@
   - Returns all recorded logs.
   - Clears the logs once they have been read.
   - JS console logs have `:console-api` for `:source` field.
-  - Entries about errors will have SEVERE level."
+  - Entries about errors will have SEVERE level.
+
+  Chrome/Edge specific extension."
   ([driver]
    (get-logs driver "browser"))
   ([driver logtype]
@@ -2223,63 +1979,33 @@
 ;; alerts
 ;;
 
-(defmulti get-alert-text
-  "Have `driver` return text string from alert dialog (if present)."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn get-alert-text
+  "Have `driver` return text string from alert dialog (if present).
 
-(defmethods get-alert-text
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-get-alert-text"
   [driver]
   (:value (execute {:driver driver
                     :method :get
                     :path   [:session (:session driver) :alert :text]})))
 
-(defmethods get-alert-text
-  [:chrome :edge]
-  [driver]
-  (:value (execute {:driver driver
-                    :method :get
-                    :path   [:session (:session driver) :alert_text]})))
-
-(defmulti dismiss-alert
-  "Have `driver` cancel open alert dialog."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn dismiss-alert
+  "Have `driver` cancel open alert dialog.
 
-(defmethods dismiss-alert
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-dismiss-alert"
   [driver]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :alert :dismiss]}))
 
-(defmethods dismiss-alert
-  [:chrome :edge]
-  [driver]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :dismiss_alert]}))
+(defn accept-alert
+  "Have `driver` accept open alert dialog.
 
-(defmulti accept-alert
-  "Have `driver` accept open alert dialog."
-  {:arglists '([driver])}
-  dispatch-driver)
-
-(defmethods accept-alert
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-accept-alert"
   [driver]
   (execute {:driver driver
             :method :post
             :path   [:session (:session driver) :alert :accept]}))
 
-(defmethods accept-alert
-  [:chrome :edge]
-  [driver]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :accept_alert]}))
-
 ;;
 ;; network
 ;;
@@ -2356,6 +2082,9 @@
 (defmulti displayed-el?
   "Return true if `driver` finds `el` is displayed/visible.
 
+  Displayed-ness is not part of w3c WebDriver spec and is vendor specific.
+  https://www.w3.org/TR/webdriver2/#element-displayedness
+
   See [[query]] for details on `q`.
 
   Note: Safari webdriver has not implemented `displayed`, for it
@@ -2363,14 +2092,16 @@
   {:arglists '([driver el])}
   dispatch-driver)
 
-(defmethod displayed-el? :default
+(defmethod displayed-el?
+  :default
   [driver el]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
                     :method :get
                     :path   [:session (:session driver) :element el :displayed]})))
 
-(defmethod displayed-el? :safari
+(defmethod displayed-el?
+  :safari
   [driver el]
   {:pre [(some? el)]}
   (cond
@@ -2383,7 +2114,10 @@
     :else true))
 
 (defn displayed?
-  "Return true if element found by `driver` with query `q` is effectively displayed."
+  "Return true if element found by `driver` with query `q` is effectively displayed.
+
+  Displayed-ness is not part of w3c WebDriver spec and is vendor specific.
+  https://www.w3.org/TR/webdriver2/#element-displayedness"
   [driver q]
   (displayed-el? driver (query driver q)))
 
@@ -2404,7 +2138,9 @@
 (defn selected-el?
   "Return true if `driver` determines element `el` is selected.
 
-  For use on input elements like checkboxes, radio buttons and option elements."
+  For use on input elements like checkboxes, radio buttons and option elements.
+
+  https://www.w3.org/TR/webdriver2/#dfn-is-element-selected"
   [driver el]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
@@ -2423,7 +2159,9 @@
 (defn enabled-el?
   "Return true if `driver` determines element `el` is enabled.
 
-  For use on form elements."
+  For use on form elements.
+
+  https://www.w3.org/TR/webdriver2/#dfn-is-element-enabled"
   [driver el]
   {:pre [(some? el)]}
   (:value (execute {:driver driver
@@ -2719,87 +2457,14 @@
     (wait-visible q opts)
     (click q)))
 
-;;
-;; touch
-;;
-
-(defmulti touch-tap
-  "Have `driver` touch tap element found by query `q`.
+(defn touch-tap
+ "Have `driver` touch tap element found by query `q`.
 
   See [[query]] for details on `q`."
-  {:arglists '([driver q])}
-  dispatch-driver)
-
-(defmethod touch-tap
-  :chrome
   [driver q]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :touch :click]
-            :data   {:element (query driver q)}}))
-
-(defmulti touch-down
-  "Have `driver` touch down
-  - on element found by query `q`
-  - or `x` `y` coordinate
-
-  See [[query]] for details on `q`."
-  {:arglists '([driver q] [driver x y])}
-  dispatch-driver)
-
-(defmethod touch-down
-  :chrome
-  ([driver q]
-   (let [{:keys [x y]}
-         (get-element-location driver q)]
-     (touch-down driver x y)))
-  ([driver x y]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :touch :down]
-             :data   {:x (int x) :y (int y)}})))
-
-(defmulti touch-up
-  "Have `driver` touch up
-  - on element found by query `q`
-  - or `x` `y` coordinate
-
-  See [[query]] for details on `q`."
-  {:arglists '([driver q] [driver x y])}
-  dispatch-driver)
-
-(defmethod touch-up
-  :chrome
-  ([driver q]
-   (let [{:keys [x y]}
-         (get-element-location driver q)]
-     (touch-down driver x y)))
-  ([driver x y]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :touch :up]
-             :data   {:x (int x) :y (int y)}})))
-
-(defmulti touch-move
-  "Have `driver` touch move
-  - on element found by query `q`
-  - or `x` `y` coordinate
-
-  See [[query]] for details on `q`."
-  {:arglists '([driver q] [driver x y])}
-  dispatch-driver)
-
-(defmethod touch-move
-  :chrome
-  ([driver q]
-   (let [{:keys [x y]}
-         (get-element-location driver q)]
-     (touch-move driver x y)))
-  ([driver x y]
-   (execute {:driver driver
-             :method :post
-             :path   [:session (:session driver) :touch :move]
-             :data   {:x (int x) :y (int y)}})))
+  (let [touch (-> (make-touch-input)
+                  (add-pointer-click-el (query driver q)))]
+    (perform-actions driver touch)))
 
 ;;
 ;; skip/when driver
@@ -2890,22 +2555,10 @@
 (defn- make-input* [text & more]
   (codepoints (apply str text more)))
 
-(defmulti fill-el
-  "Have `driver` fill input element `el` with `text` (and optionally `more` text)."
-  {:arglists '([driver el text & more])}
-  dispatch-driver)
-
-(defmethod fill-el
-  :default
-  [driver el text & more]
-  {:pre [(some? el)]}
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :element el :value]
-            :data   {:value (apply make-input* text more)}}))
+(defn fill-el
+  "Have `driver` fill input element `el` with `text` (and optionally `more` text).
 
-(defmethods fill-el
-  [:firefox :safari]
+  https://www.w3.org/TR/webdriver2/#dfn-element-send-keys"
   [driver el text & more]
   {:pre [(some? el)]}
   (execute {:driver driver
@@ -2913,28 +2566,11 @@
             :path   [:session (:session driver) :element el :value]
             :data   {:text (str/join (apply make-input* text more))}}))
 
-(defmulti ^:private fill-active*
-  {:arglists '([driver text & more])}
-  dispatch-driver)
-
-(defmethod fill-active*
-  :chrome
-  [driver text & more]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :keys]
-            :data   {:value (apply make-input* text more)}}))
-
-(defmethods fill-active*
-  [:firefox :safari]
-  [driver text & more]
-  (let [el (get-active-element* driver)]
-    (apply fill-el driver el text more)))
-
 (defn fill-active
   "Have `driver` fill active element with `text` (and optionally `more` text)."
   [driver text & more]
-  (apply fill-active* driver text more))
+  (let [el (get-active-element* driver)]
+    (apply fill-el driver el text more)))
 
 (defn fill
   "Have `driver` fill input element found by `q` with `text` (and optionally `more` text).
@@ -3049,7 +2685,9 @@
       (click-el driver option-el))))
 
 (defn clear-el
-  "Have `driver` clear input element `el`"
+  "Have `driver` clear input element `el`
+
+  https://www.w3.org/TR/webdriver2/#dfn-element-clear"
   [driver el]
   {:pre [(some? el)]}
   (execute {:driver driver
@@ -3129,88 +2767,57 @@
 ;; https://github.com/SeleniumHQ/selenium/blob/bc19742bb0256c0cb73a47eec5361aa7a5743723/py/selenium/webdriver/remote/webdriver.py#L674
 ;; https://searchfox.org/mozilla-central/source/testing/webdriver/src/command.rs#529
 
-(defmulti ^:private set-timeout*
-  "Basic method to set a specific timeout."
-  {:arglists '([driver type sec])}
-  dispatch-driver)
+(defn set-timeouts
+  "Set `millisecond` timeouts for any of `:script` `:pageLoad` `implicit`.
 
-(defmethod set-timeout*
-  :default
-  [driver type sec]
-  (execute {:driver driver
-            :method :post
-            :path   [:session (:session driver) :timeouts]
-            :data   {type (util/sec->ms sec)}}))
+  Note the capitilization of `:pageLoad`.
 
-(defmethod set-timeout*
-  :chrome
-  [driver type sec]
+  https://www.w3.org/TR/webdriver2/#dfn-set-timeouts"
+  [driver timeouts]
+  ;; allow for lowercase pageload
   (execute {:driver driver
             :method :post
-            :path   [:session (:session driver) :timeouts]
-            :data   {:type type :ms (util/sec->ms sec)}}))
+            :path [:session (:session driver) :timeouts]
+            :data timeouts} ))
 
-(defmulti set-script-timeout
+(defn set-script-timeout
   "Sets `driver` timeout `seconds` for executing JavaScript."
-  {:arglists '([driver seconds])}
-  dispatch-driver)
-
-(defmethod set-script-timeout
-  :default
   [driver seconds]
-  (set-timeout* driver :script seconds))
+  (set-timeouts driver {:script (util/sec->ms seconds)}))
 
-(defmulti set-page-load-timeout
+(defn set-page-load-timeout
   "Sets `driver` timeout `seconds` for loading a page."
-  {:arglists '([driver seconds])}
-  dispatch-driver)
-
-(defmethod set-page-load-timeout
-  :default
-  [driver sec]
-  (set-timeout* driver :pageLoad sec))
-
-(defmethod set-page-load-timeout
-  :chrome
   [driver seconds]
-  (set-timeout* driver "page load" seconds))
-
-(defmulti set-implicit-timeout
-  "Sets `driver` timeout `seconds` to find elements on the page."
-  {:arglists '([driver seconds])}
-  dispatch-driver)
+  (set-timeouts driver {:pageLoad (util/sec->ms seconds)}))
 
-(defmethod set-implicit-timeout
-  :default
+(defn set-implicit-timeout
+  "Sets `driver` timeout `seconds` for finding elements on the page."
   [driver seconds]
-  (set-timeout* driver :implicit seconds))
+  (set-timeouts driver {:implicit (util/sec->ms seconds)}))
 
-(defmulti ^:private get-timeout*
-  "Basic method to get a map of all the timeouts."
-  {:arglists '([driver])}
-  dispatch-driver)
+(defn get-timeouts
+  "Get `millisecond` timeouts for `:script` `:pageLoad` `implicit`.
 
-(defmethod get-timeout*
-  :default
+  https://www.w3.org/TR/webdriver2/#dfn-get-timeouts"
   [driver]
   (:value (execute {:driver driver
                     :method :get
                     :path   [:session (:session driver) :timeouts]})))
 
 (defn get-script-timeout
-  "Returns `driver` timeout in seconds for executing JavaScript."
+  "Returns `driver` timeout in `seconds` for executing JavaScript."
   [driver]
-  (-> driver get-timeout* :script util/ms->sec))
+  (-> driver get-timeouts :script util/ms->sec))
 
 (defn get-page-load-timeout
-  "Returns `driver` timeout in seconds for loading a page."
+  "Returns `driver` timeout in `seconds` for loading a page."
   [driver]
-  (-> driver get-timeout* :pageLoad util/ms->sec))
+  (-> driver get-timeouts :pageLoad util/ms->sec))
 
 (defn get-implicit-timeout
-  "Returns `driver` timeout in seconds to find elements on the page."
+  "Returns `driver` timeout in `seconds` for finding elements on the page."
   [driver]
-  (-> driver get-timeout* :implicit util/ms->sec))
+  (-> driver get-timeouts :implicit util/ms->sec))
 
 (defmacro with-script-timeout
   "Execute `body` temporarily setting `driver` to timeout `seconds` for executing JavaScript.
@@ -3252,15 +2859,13 @@
   (with-open [out (io/output-stream filepath)]
     (.write out ^bytes (b64-decode b64str))))
 
-(defmulti screenshot
-  "Have `driver` save a PNG format screenshot of the current page to `file`.
+(defn screenshot
+ "Have `driver` save a PNG format screenshot of the current page to `file`.
   Throws if screenshot is empty.
 
-  `file` can be either a string or `java.io.File`, any missing parent directories are automatically created."
-  {:arglists '([driver file])}
-  dispatch-driver)
+  `file` can be either a string or `java.io.File`, any missing parent directories are automatically created.
 
-(defmethod screenshot :default
+  https://www.w3.org/TR/webdriver2/#dfn-take-screenshot "
   [driver file]
   (let [resp   (execute {:driver driver
                          :method :get
@@ -3271,22 +2876,14 @@
     (create-dirs-for-file file)
     (b64-to-file b64str file)))
 
-(defmulti screenshot-element
-  "Have `driver` save a PNG format screenshot of the element found by query `q` to `file`.
+(defn screenshot-element
+ "Have `driver` save a PNG format screenshot of the element found by query `q` to `file`.
 
   See [[query]] for details on `q`.
 
-  `file` can be either a string or `java.io.File`, any missing parent directories are automatically created."
-  {:arglists '([driver q file])}
-  dispatch-driver)
-
-(defmethod screenshot-element
-  :default
-  [_driver _q _file]
-  (util/error "This driver doesn't support screenshots on elements."))
+  `file` can be either a string or `java.io.File`, any missing parent directories are automatically created.
 
-(defmethods screenshot-element
-  [:chrome :edge :firefox]
+  https://www.w3.org/TR/webdriver2/#dfn-take-element-screenshot"
   [driver q file]
   (let [el     (query driver q)
         resp   (execute {:driver driver
@@ -3339,17 +2936,12 @@
   - `:shrinkToFit` defaults to `true`
   - `:pageRanges` a vector, 1-based pages to include, example `[\"1-3\" \"6\"]` or `[]` for all (default)
 
-
-  At the time of this writing current WebDriver support:
-  - chrome, works in headless mode only, supports all opts
-  - edge, works in headless only, supports all opts
-  - firefox, might not support all opts
-  - safari, feature is not implemented"
+  https://www.w3.org/TR/webdriver2/#dfn-print-page"
   {:arglists '([driver file] [driver file opts])}
   dispatch-driver)
 
 (defmethod print-page
-  :default
+  :default ;; last checked safari 2024-08-08
   [_driver _file & [_opts]]
   (util/error "This driver doesn't support printing pages to PDF."))
 
@@ -3573,19 +3165,19 @@
                      {:port port})))
 
         driver    (cond-> driver
-                    true             (drv/set-browser-log-level log-level)
-                    true             (drv/set-path path-driver)
-                    true             (drv/set-port port)
+                    log-level        (drv/set-browser-log-level log-level)
+                    path-driver      (drv/set-path path-driver)
+                    port             (drv/set-port port)
                     dev              (drv/set-perf-logging (:perf dev))
                     driver-log-level (drv/set-driver-log-level driver-log-level)
                     args-driver      (drv/set-args args-driver)
-                    path-browser     (drv/set-binary path-browser)
+                    path-browser     (drv/set-browser-binary path-browser)
                     download-dir     (drv/set-download-dir download-dir))
         proc-args (drv/get-args driver)
         _         (log/debugf "Starting process: %s" (str/join \space proc-args))
         process   (proc/run proc-args {:log-stdout log-stdout
                                        :log-stderr log-stderr
-                                       :env        env})]
+                                       :env        (merge (:env driver) env)})]
     (util/assoc-some driver
                      :env env
                      :process process
@@ -3669,11 +3261,9 @@
 
   - `opts`: an map of the following optional parameters:
 
-  -- `:capabilities` a map of desired capabilities your
+  -- `:capabilities` a map of the capabilities your
   browser should support;
 
-  -- `:desired-capabilities`: an alias for `:capabilities`.
-
   -- `headless` is a boolean flag to run the browser in headless mode
   (i.e. without GUI window). Useful when running tests on CI servers
   rather than local machine. Currently, only FF and Chrome support headless mode.
@@ -3719,8 +3309,7 @@
                      headless
                      user-agent
                      capabilities
-                     load-strategy
-                     desired-capabilities]}]]
+                     load-strategy]}]]
   (when (not webdriver-url)
     (wait-running driver))
   (let [type          (:type driver)
@@ -3730,7 +3319,7 @@
                         size          (drv/set-window-size with height)
                         url           (drv/set-url url)
                         headless      (drv/set-headless)
-                        args          (drv/set-options-args args)
+                        args          (drv/add-browser-args args)
                         proxy         (drv/set-proxy proxy)
                         load-strategy (drv/set-load-strategy load-strategy)
                         prefs         (drv/set-prefs prefs)
@@ -3742,8 +3331,7 @@
                         (->
                          (drv/set-capabilities (:capabilities defaults-global))
                          (drv/set-capabilities (get-in defaults [type :capabilities]))
-                         (drv/set-capabilities capabilities)
-                         (drv/set-capabilities desired-capabilities)))
+                         (drv/set-capabilities capabilities)))
         caps          (:capabilities driver)
         session       (create-session driver caps)]
     (assoc driver :session session)))
diff --git a/src/etaoin/impl/driver.clj b/src/etaoin/impl/driver.clj
index 2886167..90bafff 100644
--- a/src/etaoin/impl/driver.clj
+++ b/src/etaoin/impl/driver.clj
@@ -31,8 +31,7 @@
   https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol
 
   Selenium Python source code for Firefox
-  https://github.com/SeleniumHQ/selenium/blob/master/py/selenium/webdriver/firefox/options.py
-  "
+  https://github.com/SeleniumHQ/selenium/blob/master/py/selenium/webdriver/firefox/options.py"
   (:require
    [babashka.fs :as fs]
    [clojure.string :as string]
@@ -66,13 +65,15 @@
   [driver]
   (or (:args driver) []))
 
+(defn- unsupported-msg [driver feature]
+  (format "%s does not support %s" (:type driver) feature))
 
 ;;
-;; Port
+;; WebDriver Port - via webdriver command line arg
 ;;
 
 (defmulti set-port
-  "Updates driver's map with the given port added to the args."
+  "Communication port for the webdriver, set as a command line arg."
   {:arglists '([driver port])}
   dispatch-driver)
 
@@ -87,7 +88,7 @@
   (set-args driver [(str "--port=" port)]))
 
 ;;
-;; capabilities
+;; Capabilities - are sent during webdriver session creation
 ;;
 
 (defn set-capabilities
@@ -96,59 +97,67 @@
     (update driver :capabilities deep-merge caps)
     driver))
 
+;;
+;; Load strategy is a w3c webdrive spec capability
+;;
+
 (defn set-load-strategy
+  "Page load strategy is part of the w3c spec"
   [driver strategy]
   (assoc-in driver [:capabilities :pageLoadStrategy] strategy))
 
-
 ;;
-;; options utils
+;; Vendor specific options are specified in capabalities under a vendor specific name
 ;;
 
-(defmulti options-name dispatch-driver) ;; todo nil default
+(defmulti vendor-options-name dispatch-driver) ;; todo nil default
 
-(defmethod options-name
+(defmethod vendor-options-name
   :firefox
   [_driver]
   :moz:firefoxOptions)
 
-(defmethod options-name
+(defmethod vendor-options-name
   :chrome
   [_driver]
-  :chromeOptions)
+  :goog:chromeOptions)
 
-(defmethod options-name
+(defmethod vendor-options-name
   :safari
   [_driver]
-  :safariOptions)
+  :safari:options)
 
-(defmethod options-name
+(defmethod vendor-options-name
   :edge
   [_driver]
-  :edgeOptions)
+  :ms:edgeOptions)
 
-(defmethod options-name
-  :opera
-  [_driver]
-  :operaOptions)
+(defn- update-vendor-capabilities [driver key f val]
+  (update-in driver
+             [:capabilities (vendor-options-name driver) key]
+             f val))
+
+(defn- set-vendor-capabilities [driver key val]
+  (assoc-in driver
+            [:capabilities (vendor-options-name driver) key]
+            val))
 
-(defn set-options-args
-  "Adds command line arguments for a browser binary (not a driver)."
+(defn add-browser-args
+  "Adds command line arguments for the browser binary (not the webdriver binary)."
   [driver args]
-  (update-in driver
-             [:capabilities (options-name driver) :args]
-             append-args (map str args)))
+  (update-vendor-capabilities driver :args append-args (map str args)))
 
 ;;
-;; Profiles
+;; Profiles - if supported, are set via browser args
 ;;
 
+;; vendor specific
 (defmulti set-profile dispatch-driver)
 
 (defmethod set-profile
   :default
   [driver _profile]
-  (log/infof "This driver doesn't support setting a profile.")
+  (log/infof (unsupported-msg driver "setting a profile"))
   driver)
 
 (defmethod set-profile
@@ -162,8 +171,8 @@
                   profile)
         user-data-dir (str (fs/parent profile))
         profile-dir   (str  (fs/file-name profile))]
-    (set-options-args driver [(format "--user-data-dir=%s" user-data-dir)
-                              (format "--profile-directory=%s" profile-dir)])))
+    (add-browser-args driver [(format "--user-data-dir=%s" user-data-dir)
+                                      (format "--profile-directory=%s" profile-dir)])))
 
 (defmethod set-profile
   :firefox
@@ -173,14 +182,14 @@
   ;; says to specify a marionette port manually.
   [driver profile]
   (-> driver
-      (set-options-args ["-profile" profile])
+      (add-browser-args ["-profile" profile])
       ((fn [driver]
          (if (some #(= "--marionette-port" %) (get-args driver))
            driver
            (set-args driver ["--marionette-port" 2828]))))))
 
 ;;
-;; window size
+;; Browser initial window size, if supported, is set via command line args
 ;;
 
 (defmulti set-window-size
@@ -191,21 +200,21 @@
 (defmethod set-window-size
   :default
   [driver _w _h]
-  (log/infof "This driver doesn't support setting window size.")
+  (log/infof (unsupported-msg driver "setting initial window size"))
   driver)
 
-(defmethod set-window-size
-  :chrome
+(defmethods set-window-size
+  [:chrome :edge]
   [driver w h]
-  (set-options-args driver [(format "--window-size=%s,%s" w h)]))
+  (add-browser-args driver [(format "--window-size=%s,%s" w h)]))
 
 (defmethod set-window-size
   :firefox
   [driver w h]
-  (set-options-args driver ["-width" w "-height" h]))
+  (add-browser-args driver ["-width" w "-height" h]))
 
 ;;
-;; initial URL
+;; Initial URL - Set, if supported, via browser arg
 ;;
 
 (defmulti set-url
@@ -216,19 +225,19 @@
 (defmethod set-url
   :default
   [driver _url]
-  (log/infof "This driver doesn't support setting initial URL.")
+  (log/infof (unsupported-msg driver "setting initial URL to load"))
   driver)
 
 (defmethod set-url
   :firefox
   [driver url]
-  (set-options-args driver ["--new-window" url]))
+  (add-browser-args driver ["--new-window" url]))
 
 ;; Don't know why but Chrome ignores all the --new-window, --app
 ;; or --google-base-url parameters when starting.
 
 ;;
-;; headless feature
+;; Headless mode, if supported, is supported via browser arg
 ;;
 
 (defmulti set-headless
@@ -238,7 +247,7 @@
 (defmethod set-headless
   :default
   [driver]
-  (log/infof "This driver doesn't support setting headless mode.")
+  (log/infof (unsupported-msg driver "headless mode"))
   driver)
 
 (defmethods set-headless
@@ -246,21 +255,16 @@
   [driver]
   (-> driver
       (assoc :headless true)
-      (set-options-args ["--headless"])))
-
-(defmulti is-headless?
-  {:arglists '([driver])}
-  dispatch-driver)
+      (add-browser-args ["--headless"])))
 
-(defmethod is-headless?
-  :default
+(defn is-headless?
   [driver]
-  (if-let [args (get-in driver [:capabilities (options-name driver) :args])]
+  (if-let [args (get-in driver [:capabilities (vendor-options-name driver) :args])]
     (contains? (set args) "--headless")
     (:headless driver)))
 
 ;;
-;; HTTP proxy
+;; HTTP proxy - is part of the w3c webdriver capabilities spec
 ;;
 
 (defn proxy->w3c
@@ -279,12 +283,13 @@
       bypass         (assoc :noProxy bypass))))
 
 (defn set-proxy
+  "The proxy is part of the w3c spec"
   [driver proxy]
   (let [proxy-w3c (proxy->w3c proxy)]
     (set-capabilities driver {:proxy proxy-w3c})))
 
 ;;
-;; Custom preferences
+;; Custom preferences - are vendor specific capabilities
 ;;
 
 (defmulti set-prefs
@@ -294,15 +299,13 @@
 (defmethod set-prefs
   :default
   [driver _prefs]
-  (log/infof "This driver doesn't support setting preferences.")
+  (log/info (unsupported-msg driver "setting vendor preferences"))
   driver)
 
 (defmethods set-prefs
-  [:firefox :chrome]
+  [:firefox :chrome :edge]
   [driver prefs]
-  (update-in driver
-             [:capabilities (options-name driver) :prefs]
-             merge prefs))
+  (update-vendor-capabilities driver :prefs merge prefs))
 
 ;;
 ;; Download folder
@@ -322,20 +325,20 @@
 (defmethod set-download-dir
   :default
   [driver _path]
-  (log/infof "This driver doesn't support setting a download directory.")
+  (log/info (unsupported-msg driver "setting download directory"))
   driver)
 
 ;; https://github.com/rshf/chromedriver/issues/338
 ;; trailing slash is mandatory for Chrome
-(defmethod set-download-dir
-  :chrome
+(defmethods set-download-dir
+  [:chrome :edge]
   [driver path]
   (set-prefs driver {:download.default_directory   (add-trailing-slash path)
                      :download.prompt_for_download false}))
 
 (def ^{:private true
        :doc     "A set of content types that should be downloaded without asking a user."}
-  ff-content-types
+  firefox-content-types
   #{"application/gzip"
     "application/json"
     "application/msword"
@@ -375,25 +378,18 @@
                      :browser.download.folderList     2
                      :browser.download.useDownloadDir true
                      :browser.helperApps.neverAsk.saveToDisk
-                     (string/join ";" ff-content-types)}))
+                     (string/join ";" firefox-content-types)}))
 
 ;;
-;; binary path
+;; Browser binary path - is set under vendor specific capability
 ;;
 
-(defmulti set-binary
-  {:arglists '([driver binary])}
-  dispatch-driver)
-
-(defmethod set-binary
-  :default
+(defn set-browser-binary
   [driver binary]
-  (assoc-in driver
-            [:capabilities (options-name driver) :binary]
-            binary))
+  (set-vendor-capabilities driver :binary binary))
 
 ;;
-;; logging
+;; Browser console logging - is set via vendor specific settings
 ;;
 
 (defn- remap-log-level
@@ -413,11 +409,17 @@
      :crit
      :critical) "SEVERE"
     :all        "ALL"
-    (assert false (format "Logging level %s is unsupported." level))))
+    (assert false (format "Logging level %s is unrecognized." level))))
 
+(comment
+  (remap-log-level :off)
+  (remap-log-level :foo)
+
+  )
 
 ;;
-;; https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#loggingpreferences-json-object
+;; These used to be supported by loggingPrefs, but with newer capabilities model
+;; are browser specific.
 ;;
 (defmulti set-browser-log-level
   "Sets browser logging level."
@@ -426,12 +428,19 @@
 
 (defmethod set-browser-log-level
   :default
+  [driver _level]
+  (log/info (unsupported-msg driver "setting the browser log level"))
+  driver)
+
+(defmethods set-browser-log-level
+  [:chrome :edge]
   [driver level]
   (assoc-in driver
-            [:capabilities :loggingPrefs :browser]
+            ;; supports: ALL, DEBUG, INFO, WARNING, SEVERE, or OFF.
+            ;; a bit counter-intuitive, but does not go under goog:chromeOptions
+            [:capabilities :goog:loggingPrefs :browser]
             (remap-log-level level)))
 
-
 ;; http://chromedriver.chromium.org/capabilities
 ;; http://chromedriver.chromium.org/logging/performance-log
 (defn set-perf-logging
@@ -448,9 +457,9 @@
   (update driver :capabilities
           (fn [capabilities]
             (-> capabilities
-                (assoc-in [:loggingPrefs :performance]
+                (assoc-in [:goog:loggingPrefs :performance]
                           (remap-log-level level))
-                (assoc-in [(options-name driver) :perfLoggingPrefs]
+                (assoc-in [(vendor-options-name driver) :perfLoggingPrefs]
                           {:enableNetwork                network?
                            :enablePage                   page?
                            :traceCategories              (string/join "," (map name categories))
@@ -459,12 +468,6 @@
 (defmulti set-driver-log-level
   dispatch-driver)
 
-(defmethod set-driver-log-level
-  :default
-  [driver _]
-  (log/infof "The log level setting is not implemented for this driver.")
-  driver)
-
 (defmethods set-driver-log-level
   [:chrome :edge]
   [driver log-level]
@@ -484,7 +487,7 @@
       (update :post-run-actions (fnil conj []) :discover-safari-webdriver-log)))
 
 ;;
-;; User-Agent
+;; User-Agent - supported through various custom schemes
 ;; https://stackoverflow.com/questions/29916054/
 ;;
 
@@ -493,18 +496,18 @@
   {:arglists '([driver user-agent])}
   dispatch-driver)
 
+(defmethods set-user-agent
+  [:default]
+  [driver _user-agent]
+  (log/info (unsupported-msg driver "setting the user-agent" ))
+  driver)
+
 (defmethods set-user-agent
   [:chrome :edge]
   [driver user-agent]
-  (set-options-args driver [(str "--user-agent=" user-agent)]))
+  (add-browser-args driver [(str "--user-agent=" user-agent)]))
 
 (defmethods set-user-agent
   [:firefox]
   [driver user-agent]
   (set-prefs driver {:general.useragent.override user-agent}))
-
-(defmethods set-user-agent
-  [:default]
-  [driver _user-agent]
-  (log/infof "This driver doesn't support setting a user-agent.")
-  driver)
diff --git a/test/etaoin/api_test.clj b/test/etaoin/api_test.clj
index 78f88cb..5fffcc5 100644
--- a/test/etaoin/api_test.clj
+++ b/test/etaoin/api_test.clj
@@ -2,6 +2,7 @@
   (:require
    [babashka.fs :as fs]
    [babashka.process :as p]
+   [cheshire.core :as json]
    [clojure.edn :as edn]
    [clojure.java.io :as io]
    [clojure.java.shell :as shell]
@@ -128,6 +129,15 @@
   report-browsers
   test-server)
 
+(deftest test-navigation
+  (is (= (test-server-url "test.html")  (e/get-url *driver*)) "initial page")
+  (e/go *driver* (test-server-url "test2.html"))
+  (is (= (test-server-url "test2.html")  (e/get-url *driver*)) "navigate to 2nd page")
+  (e/back *driver*)
+  (is (= (test-server-url "test.html")  (e/get-url *driver*)) "back to initial page")
+  (e/forward *driver*)
+  (is (= (test-server-url "test2.html")  (e/get-url *driver*)) "forward to 2nd page"))
+
 (deftest test-visible
   (doto *driver*
     (-> (e/visible? {:id :button-visible}) is)
@@ -456,17 +466,46 @@
   (doto *driver*
     (e/close-window)))
 
-(deftest test-drag-n-drop
+(deftest test-drag-and-drop
   (let [url   (test-server-url "drag-n-drop/index.html")
         doc   {:class :document}
         trash {:xpath "//div[contains(@class, 'trash')]"}]
-    (doto *driver*
-      (e/go url)
-      (e/drag-and-drop doc trash)
-      (e/drag-and-drop doc trash)
-      (e/drag-and-drop doc trash)
-      (e/drag-and-drop doc trash)
-      (-> (e/absent? doc) is))))
+    (e/go *driver* url)
+    (is (= 4 (count (e/query-all *driver* doc)))
+        "doc count at start")
+
+    (doseq [n (range 1 5)]
+      (e/drag-and-drop *driver* doc trash)
+      (is (= (- 4 n) (count (e/query-all *driver* doc)))
+          (format "doc count after drag and drop # %d" n)))
+
+    (is (e/absent? *driver* doc)
+        "no docs after last drag and drop")))
+
+(deftest test-drag-and-drop-alt
+  (let [url   (test-server-url "drag-n-drop/index.html")
+        doc   {:class :document}
+        trash {:xpath "//div[contains(@class, 'trash')]"}]
+    (e/go *driver* url)
+    (is (= 4 (count (e/query-all *driver* doc)))
+        "doc count at start")
+
+    (e/perform-actions *driver*
+                       (-> (e/make-mouse-input)
+                           (e/add-pointer-move-to-el (e/query *driver* doc))
+                           (e/with-pointer-btn-down k/mouse-left
+                             (e/add-pointer-move-to-el (e/query *driver* trash)))))
+    (is (= 3 (count (e/query-all *driver* doc)))
+        "doc count at end")))
+
+(deftest test-double-click
+  ;; Does not work on Safari 2024-08-10
+  (e/when-not-safari *driver*
+    (e/scroll-bottom *driver*) ;; element needs to be in viewport
+                               ;; TODO: look at wheel action
+    (is (= "[not clicked]" (e/get-element-text *driver* :pointerClickTarget)))
+    (e/double-click *driver* :pointerClickTarget)
+    (is (= "[double clicked]" (e/get-element-text *driver* :pointerClickTarget)))))
 
 (deftest test-element-location
   (let [q             {:id :el-location-input}
@@ -475,6 +514,7 @@
     (is (numeric? x))
     (is (numeric? y))))
 
+;; Still relevant?:
 ;; Here and below: when running a Safari driver,
 ;; you need to unplug your second monitor. That sounds crazy,
 ;; I know. Bun nevertheless, if a Safari window appears on the second
@@ -482,7 +522,8 @@
 
 (deftest test-window-position
   (e/when-not-drivers
-    [:edge] *driver*
+    [:edge] ;; edge fails this test
+    *driver*
       (let [{:keys [x y]} (e/get-window-position *driver*)]
         (is (numeric? x))
         (is (numeric? y))
@@ -535,28 +576,31 @@
     (e/switch-window-next *driver*)
     (is (= init-handle (e/get-window-handle *driver*)) "wrapped around to original window")))
 
-;; TODO: need refactoring not working for headless & firefox
-#_
 (deftest test-maximize
-  (when-not-headless *driver*
-    (let [{:keys [x y]}          (get-window-position *driver*)
-          {:keys [width height]} (get-window-size *driver*)]
-      (maximize *driver*)
-      (let [{x' :x y' :y}                   (get-window-position *driver*)
-            {width' :width height' :height} (get-window-size *driver*)]
-        (is (not= x x'))
-        (is (not= y y'))
-        (is (not= width width'))
-        (is (not= height height'))))))
+  (when-not (e/headless? *driver*) ;; skip for headless
+    (e/set-window-position *driver* 2 2)
+    (let [orig-rect (e/get-window-rect *driver*)
+          target-rect (-> orig-rect
+                          (update :x #(+ % 2))
+                          (update :y #(+ % 2))
+                          (update :width #(- % 5))
+                          (update :height #(- % 5)))]
+      ;; move the window to ensure values will change when maximized
+      (e/set-window-rect *driver* target-rect)
+      (let [moved-rect (e/get-window-rect *driver*)]
+        ;; sanity test for move
+        (is (= target-rect moved-rect))
+        (e/maximize *driver*)
+        (let [maximed-rect (e/get-window-rect *driver*)]
+          (is (not= moved-rect maximed-rect)))))))
 
 (deftest test-active-element
-  (testing "active element"
-    (e/when-not-safari *driver*
-      (doto *driver*
-        (e/click {:id :set-active-el})
-        (-> (e/get-element-attr :active :id)
-            (= "active-el-input")
-            is)))))
+  (e/when-not-safari *driver*
+    (doto *driver*
+      (e/click {:id :set-active-el})
+      (-> (e/get-element-attr :active :id)
+          (= "active-el-input")
+          is))))
 
 (deftest test-element-text
   (let [text (e/get-element-text *driver* {:id :element-text})]
@@ -567,6 +611,9 @@
     (is (numeric? width))
     (is (numeric? height))))
 
+(deftest get-element-tag
+  (is (= "TITLE" (str/upper-case (e/get-element-tag *driver* {:tag :title})))))
+
 (deftest test-cookies
   (testing "getting all cookies"
     (let [cookies (e/get-cookies *driver*)
@@ -595,6 +642,11 @@
                      :path "/"
                      :secure false
                      :value "test2"}))))
+  (testing "setting a cookie"
+    (let [cookie {:name "etaoin-testing123" :value "foobarbaz"}]
+      (e/set-cookie *driver* cookie)
+      (is (= cookie
+             (select-keys (e/get-cookie *driver* :etaoin-testing123) [:name :value])))))
   (testing "deleting a cookie"
     (e/delete-cookie *driver* :cookie3)
     (let [cookie (e/get-cookie *driver* :cookie3)]
@@ -637,11 +689,9 @@
     (is (= 3 (count (fs/list-dir dir))))))
 
 (deftest test-screenshot-element
-  (when (or (e/chrome? *driver*)
-            (e/firefox? *driver*))
-    (util/with-tmp-file "screenshot" ".png" path
-      (e/screenshot-element *driver* {:id :css-test} path)
-      (is (valid-image? path)))))
+  (util/with-tmp-file "screenshot" ".png" path
+    (e/screenshot-element *driver* {:id :css-test} path)
+    (is (valid-image? path))))
 
 (deftest test-js-execute
   (testing "simple result"
@@ -783,30 +833,79 @@
 
 ;; actions
 
-(deftest test-actions
-  (testing "input key and mouse click"
-    (let [input    (e/query *driver* :simple-input)
-          password (e/query *driver* :simple-password)
-          textarea (e/query *driver* :simple-textarea)
-          submit   (e/query *driver* :simple-submit)
-          keyboard (-> (e/make-key-input)
-                       e/add-double-pause
-                       (e/with-key-down "\uE01B")
-                       e/add-double-pause
-                       (e/with-key-down "\uE01C")
-                       e/add-double-pause
-                       (e/with-key-down "\uE01D"))
-          mouse    (-> (e/make-mouse-input)
-                       (e/add-pointer-click-el input)
-                       e/add-pause
-                       (e/add-pointer-click-el password)
-                       e/add-pause
-                       (e/add-pointer-click-el textarea)
-                       e/add-pause
-                       (e/add-pointer-click-el submit))]
-      (e/perform-actions *driver* keyboard mouse)
-      (e/wait 1)
-      (is (str/ends-with? (e/get-url *driver*) "?login=1&password=2&message=3")))))
+(deftest test-mouse-state-actions
+  (testing "mouse state and release"
+    (is (= "[no clicks yet]" (e/get-element-text *driver* :mouseButtonState)))
+    (testing "left mouse down"
+      (e/perform-actions *driver* (-> (e/make-mouse-input)
+                                      (e/add-pointer-down)))
+      (let [button-state (-> (e/get-element-text *driver* :mouseButtonState)
+                             (json/parse-string true))]
+        (is (= {:type "mousedown"
+                :left true
+                :right false
+                :wheel false
+                :back false
+                :forward false} button-state))))
+    (e/when-not-safari *driver* ;; safari currently fails behaves differently one 2024-08-10
+      (testing "right mouse down is not additive to left mouse down in new transaction"
+        (e/perform-actions *driver* (-> (e/make-mouse-input)
+                                        (e/add-pointer-down k/mouse-middle)))
+        (let [button-state (-> (e/get-element-text *driver* :mouseButtonState)
+                               (json/parse-string true))]
+          (is (= {:type "mousedown"
+                  :left false
+                  :right false
+                  :wheel true
+                  :back false
+                  :forward false} button-state))))
+      (testing "multiple mouse buttons can be pressed in a single transaction"
+        (e/perform-actions *driver* (-> (e/make-mouse-input)
+                                        (e/add-pointer-down k/mouse-left)
+                                        (e/add-pointer-down k/mouse-middle)))
+        (let [button-state (-> (e/get-element-text *driver* :mouseButtonState)
+                               (json/parse-string true))]
+          (is (= {:type "mousedown"
+                  :left true
+                  :right false
+                  :wheel true
+                  :back false
+                  :forward false} button-state)))))
+    (testing "release actions wipes state"
+      (e/release-actions *driver*)
+      (let [button-state (-> (e/get-element-text *driver* :mouseButtonState)
+                             (json/parse-string true))]
+          (is (= {:type "mouseup"
+                  :left false
+                  :right false
+                  :wheel false
+                  :back false
+                  :forward false} button-state))))))
+
+(deftest test-combined-actions
+    (testing "input key and mouse click"
+        (let [input    (e/query *driver* :simple-input)
+              password (e/query *driver* :simple-password)
+              textarea (e/query *driver* :simple-textarea)
+              submit   (e/query *driver* :simple-submit)
+              keyboard (-> (e/make-key-input)
+                           e/add-double-pause
+                           (e/with-key-down "\uE01B")
+                           e/add-double-pause
+                           (e/with-key-down "\uE01C")
+                           e/add-double-pause
+                           (e/with-key-down "\uE01D"))
+              mouse    (-> (e/make-mouse-input)
+                           (e/add-pointer-click-el input)
+                           e/add-pause
+                           (e/add-pointer-click-el password)
+                           e/add-pause
+                           (e/add-pointer-click-el textarea)
+                           e/add-pause
+                           (e/add-pointer-click-el submit))]
+          (e/perform-actions *driver* keyboard mouse)
+          (e/wait 1)
+          (is (str/ends-with? (e/get-url *driver*) "?login=1&password=2&message=3")))))
 
 (deftest test-shadow-dom
   (testing "basic functional sanity"
@@ -847,12 +946,28 @@
            (->> (e/query-all-shadow-root *driver* {:id "shadow-root-host"} {:css "span"})
                 (mapv #(e/get-element-text-el *driver* %)))))))
 
+(deftest test-timeouts
+  (let [timeouts {:implicit 32134
+                  :script 78921
+                  :pageLoad 98765}]
+    (e/set-timeouts *driver* timeouts)
+    (is (= timeouts (e/get-timeouts *driver*)))
+    (e/set-page-load-timeout *driver* 987)
+    (e/set-implicit-timeout *driver* 876)
+    (e/set-script-timeout *driver* 765)
+    (is (= 987 (e/get-page-load-timeout *driver*)))
+    (is (= 876 (e/get-implicit-timeout *driver*)))
+    (is (= 765 (e/get-script-timeout *driver*)))
+    (is (= {:pageLoad 987000 :implicit 876000 :script 765000}
+           (e/get-timeouts *driver*)))))
+
 (comment
   ;; start test server
   (def test-server (p/process {:out :inherit :err :inherit} "bb test-server --port" 9993))
   (def url (format "http://localhost:%d/%s" 9993 "test.html"))
 
   ;; start your favourite webdriver
+  (def driver (e/chrome))
   (def driver (e/safari))
   (def driver (e/firefox))
 
diff --git a/test/etaoin/api_with_driver_test.clj b/test/etaoin/api_with_driver_test.clj
index d47b937..d1198b7 100644
--- a/test/etaoin/api_with_driver_test.clj
+++ b/test/etaoin/api_with_driver_test.clj
@@ -7,6 +7,7 @@
   We do reuse the driver selection mechanism from etaoin.api-test tho."
   (:require [babashka.fs :as fs]
             [babashka.process :as p]
+            [clojure.string :as str]
             [clojure.tools.logging :as log]
             [clojure.test :refer [deftest is testing use-fixtures]]
             [etaoin.api :as e]
@@ -34,6 +35,79 @@
   :once
   api-test/test-server)
 
+
+(deftest capabilities-population-test
+  ;; different browsers support different features and express configuration differently
+  ;; a bit brittle, adjust test expectations accordingly when you make changes to capabilities
+  (doseq [type api-test/drivers
+          :let [capabilities (atom nil)]]
+    (testing type
+      (let [expected-proxy {:proxyType "manual",
+                            :httpProxy "some.http.proxy.com:8080",
+                            :sslProxy "some.ssl.proxy.com:8080",
+                            :ftpProxy "some.ftp.proxy.com:8080",
+                            :socksProxy "socksproxy:1080",
+                            :socksVersion 5,
+                            :noProxy ["http://this.url" "http://that.url"]}]
+        (e/with-driver type {:webdriver-failed-launch-retries 0
+                             :path-driver (fake-driver-path)
+                             :load-strategy :none
+                             :path-browser "custom-browser-bin"
+                             :args ["--extra" "--args"]
+                             :log-level :info
+                             :profile "some/profile/dir"
+                             :size [1122 771]
+                             :url "https://initial-url"
+                             :download-dir "some/download/dir"
+                             :proxy {:http "some.http.proxy.com:8080"
+                                     :ftp "some.ftp.proxy.com:8080"
+                                     :ssl "some.ssl.proxy.com:8080"
+                                     :socks {:host "socksproxy:1080" :version 5}
+                                     :bypass ["http://this.url" "http://that.url"]}} driver
+          (reset! capabilities (:capabilities driver)))
+        (case type
+          :chrome (is (= {:pageLoadStrategy :none
+                          :proxy expected-proxy
+                          :goog:loggingPrefs {:browser "INFO"},
+                          :goog:chromeOptions {:w3c true
+                                               :binary "custom-browser-bin"
+                                               :args ["--window-size=1122,771"
+                                                      "--extra" "--args"
+                                                      "--user-data-dir=some/profile"
+                                                      "--profile-directory=dir"]
+                                               :prefs {:download.default_directory "some/download/dir/"
+                                                       :download.prompt_for_download false}}}
+                         @capabilities))
+          :edge (is (= {:pageLoadStrategy :none
+                        :proxy expected-proxy
+                        :goog:loggingPrefs {:browser "INFO"},
+                        :ms:edgeOptions {:w3c true
+                                         :binary "custom-browser-bin"
+                                         :args ["--window-size=1122,771"
+                                                "--extra" "--args"]
+                                         :prefs {:download.default_directory "some/download/dir/"
+                                                 :download.prompt_for_download false}}}
+                       @capabilities))
+          :firefox (let [save-to-disk (get-in @capabilities [:moz:firefoxOptions :prefs :browser.helperApps.neverAsk.saveToDisk])
+                         capabilities (update-in @capabilities [:moz:firefoxOptions :prefs] dissoc :browser.helperApps.neverAsk.saveToDisk)]
+                     (is (= {:pageLoadStrategy :none
+                             :proxy expected-proxy
+                             :moz:firefoxOptions {:binary "custom-browser-bin"
+                                                  :args ["-width" "1122" "-height" "771"
+                                                         "--new-window" "https://initial-url"
+                                                         "--extra" "--args"
+                                                         "-profile" "some/profile/dir"]
+                                                  :prefs {:browser.download.dir "some/download/dir"
+                                                          :browser.download.folderList 2
+                                                          :browser.download.useDownloadDir true}}}
+                            capabilities))
+                     (is (not (str/blank? save-to-disk))))
+          :safari (is (= {:pageLoadStrategy :none
+                          :proxy expected-proxy
+                          :safari:options {:binary "custom-browser-bin"
+                                           :args ["--extra" "--args"]}}
+                         @capabilities)))))))
+
 (deftest with-driver-tests
   (let [test-page (api-test/test-server-url "test.html")]
     (when (testing-driver? :chrome)
diff --git a/test/etaoin/unit/unit_test.clj b/test/etaoin/unit/unit_test.clj
index 4659c18..87b2529 100644
--- a/test/etaoin/unit/unit_test.clj
+++ b/test/etaoin/unit/unit_test.clj
@@ -23,7 +23,6 @@
     (testing "defaults"
       (e/with-firefox driver
         (is (= {:args ["geckodriver" "--port" 12345]
-                :capabilities {:loggingPrefs {:browser "ALL"}}
                 :host "127.0.0.1"
                 :locator "xpath"
                 :port 12345
@@ -67,25 +66,19 @@
         (e/with-firefox {:capabilities {:specified :val2
                                         :some {:deeper {:thing1 100
                                                         :thing3 300
-                                                        :thing5 500}}}
-                         :desired-capabilities {:specified-desired :val3
-                                                :some {:deeper {:thing3 3000
-                                                                :thing6 6000}}}} driver
+                                                        :thing5 500}}}} driver
           (is (>= (System/currentTimeMillis) (:created-epoch-ms driver)))
           (is (= {:args ["geckodriver" "--port" 12345],
                   :capabilities
                   {:default-firefox :val1
                    :default-global :val2
-                   :loggingPrefs {:browser "ALL"},
                    :some {:deeper {:thing0 10
                                    :thing1 100
                                    :thing2 2
-                                   :thing3 3000
+                                   :thing3 300
                                    :thing4 40
-                                   :thing5 500
-                                   :thing6 6000}}
-                   :specified :val2
-                   :specified-desired :val3}
+                                   :thing5 500}}
+                   :specified :val2}
                   :host "127.0.0.1"
                   :locator "xpath"
                   :port 12345
@@ -163,7 +156,6 @@
         ;; safari driver has a default of 4 retries
         (e/with-safari driver
           (is (= {:args ["safaridriver" "--port" 12345]
-                  :capabilities {:loggingPrefs {:browser "ALL"}}
                   :host "127.0.0.1"
                   :locator "xpath"
                   :port 12345