diff --git a/src/clj/com/rpl/specter.cljx b/src/clj/com/rpl/specter.cljx
index 27c3708..c896559 100644
--- a/src/clj/com/rpl/specter.cljx
+++ b/src/clj/com/rpl/specter.cljx
@@ -26,7 +26,8 @@
              defnavconstructor]]
     #+clj [com.rpl.specter.util-macros :only [doseqres]]
     )
-  (:require [com.rpl.specter [impl :as i] [navs :as n]]
+  (:require [com.rpl.specter.impl :as i]
+            [com.rpl.specter.navs :as n]
             [clojure.set :as set])
   )
 
diff --git a/src/clj/com/rpl/specter/impl.cljx b/src/clj/com/rpl/specter/impl.cljx
index 18c01a3..714fcb8 100644
--- a/src/clj/com/rpl/specter/impl.cljx
+++ b/src/clj/com/rpl/specter/impl.cljx
@@ -142,8 +142,8 @@
     ))
 
 #+cljs
-(defn exec-select* [this params params-idx vals structure next-fn]
-  (p/select* this params params-idx vals structure next-fn))
+(defn exec-select* [this structure next-fn]
+  (p/select* this structure next-fn))
 
 #+clj
 (defmacro exec-transform* [this & args]
@@ -152,9 +152,8 @@
     ))
 
 #+cljs
-(defn exec-transform* [this params params-idx vals structure next-fn]
-  (p/transform* this params params-idx vals structure next-fn))
-
+(defn exec-transform* [this structure next-fn]
+  (p/transform* this structure next-fn))
 
 (def RichPathExecutor
   (->ExecutorFunctions
@@ -407,7 +406,7 @@
                          (map capture-params-internally))
             combined (->> coerced
                           (map extract-nav)
-                          (partition-by class)
+                          (partition-by type)
                           (map combine-same-types)
                           )
             result-nav (if (= 1 (count combined))
diff --git a/src/clj/com/rpl/specter/navs.cljx b/src/clj/com/rpl/specter/navs.cljx
index db36f2d..6edaae1 100644
--- a/src/clj/com/rpl/specter/navs.cljx
+++ b/src/clj/com/rpl/specter/navs.cljx
@@ -1,8 +1,23 @@
 (ns com.rpl.specter.navs
-  (:use [com.rpl.specter macros]
-        [com.rpl.specter.util-macros :only [doseqres]])
-  (:require [com.rpl.specter [impl :as i]]
-            [clojure [walk :as walk]]
+  #+cljs (:require-macros
+            [com.rpl.specter.macros
+              :refer
+              [pathed-collector
+               variable-pathed-nav
+               fixed-pathed-nav
+               defcollector
+               defnav
+               defpathedfn
+               richnav
+               defnavconstructor
+              ]]
+            [com.rpl.specter.util-macros :refer
+              [doseqres]]
+            )
+  (:use #+clj [com.rpl.specter macros]
+        #+clj [com.rpl.specter.util-macros :only [doseqres]])
+  (:require [com.rpl.specter.impl :as i]
+            [clojure.walk :as walk]
              #+clj [clojure.core.reducers :as r]
              )
   )
diff --git a/src/clj/com/rpl/specter/transients.cljx b/src/clj/com/rpl/specter/transients.cljx
index b7f7edf..5b08991 100644
--- a/src/clj/com/rpl/specter/transients.cljx
+++ b/src/clj/com/rpl/specter/transients.cljx
@@ -8,7 +8,7 @@
         [com.rpl.specter.macros :only
          [defnav
           defpathedfn]])
-  (:require [com.rpl.specter [navs :as n]]
+  (:require [com.rpl.specter.navs :as n]
             [com.rpl.specter :refer [subselect selected?]]))
 
 (defnav