diff --git a/common/content/commands.js b/common/content/commands.js
index 131589e0..503e697b 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -1330,7 +1330,7 @@ var Commands = Module("commands", {
                                     args["-description"],
                                     Command.bindMacro(args, "-ex",
                                         function makeParams(args, modifiers) ({
-                                            args:  {
+                                            args: {
                                                 __proto__: args,
                                                 toString: function () this.string,
                                             },
diff --git a/common/content/events.js b/common/content/events.js
index 26217d4a..ca8f5646 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -57,8 +57,10 @@ var ProcessorStack = Class("ProcessorStack", {
                 events.feedingKeys = false;
             }
 
-            for (var res = this.actions[0]; callable(res);)
-                res = res();
+            for (var res = this.actions[0]; callable(res);) {
+                res = dactyl.trapErrors(res);
+                dbg("ACTION RES: " + res);
+            }
             result = res === Events.PASS ? Events.PASS : Events.KILL;
         }
         else if (result !== Events.KILL && !this.actions.length &&
diff --git a/common/content/modes.js b/common/content/modes.js
index 560f616d..a55d1b4e 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -424,7 +424,7 @@ var Modes = Module("modes", {
 
         hidden: false,
 
-        input: false,
+        input: Class.memoize(function () this.bases.length && this.bases.some(function (b) b.input)),
 
         get passUnknown() this.input,
 
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 1e959f27..57afe86b 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -165,22 +165,16 @@ var RangeFinder = Module("rangefinder", {
     modes: function (dactyl, modules, window) {
         const { modes } = modules;
         modes.addMode("FIND", {
-            extended: true,
             description: "Find mode, active when typing search input",
             bases: [modes.COMMAND_LINE],
-            input: true
         });
         modes.addMode("FIND_FORWARD", {
-            extended: true,
             description: "Forward Find mode, active when typing search input",
-            bases: [modes.FIND],
-            input: true
+            bases: [modes.FIND]
         });
         modes.addMode("FIND_BACKWARD", {
-            extended: true,
             description: "Backward Find mode, active when typing search input",
-            bases: [modes.FIND],
-            input: true
+            bases: [modes.FIND]
         });
     },
     commands: function (dactyl, modules, window) {
@@ -191,7 +185,8 @@ var RangeFinder = Module("rangefinder", {
             { argCount: "0" });
     },
     commandline: function (dactyl, modules, window) {
-        this.CommandMode = Class("CommandFindMode", modules.CommandMode, {
+        const { rangefinder } = modules;
+        rangefinder.CommandMode = Class("CommandFindMode", modules.CommandMode, {
             init: function init(mode) {
                 this.mode = mode;
                 init.supercall(this);