diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index c3da6d2c..e64b79a1 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -917,6 +917,7 @@ Module.INIT = {
                 module = objs[i] = Object.create(module);
 
             modules.jsmodules[this.constructor.className] = module;
+            util.dump(" ====================================== INIT " + this.constructor.className + " ====================================== ");
             locals.reverse().forEach(function (fn, i) update(objs[i], fn.apply(module, args)))
             module.instance = module;
             module.init();
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index a5b9280d..cbb323ca 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -20,14 +20,14 @@ var RangeFinder = Module("rangefinder", {
             this.lastFindPattern = "";
         },
 
-        get commandline() this.modules.commandline,
-        get modes() this.modules.modes,
-        get options() this.modules.options,
-
         get rangeFind() modules.buffer.localStore.rangeFind,
         set rangeFind(val) modules.buffer.localStore.rangeFind = val
     }),
 
+    get commandline() this.modules.commandline,
+    get modes() this.modules.modes,
+    get options() this.modules.options,
+
     openPrompt: function (mode) {
         this.CommandMode(mode).open();
 
@@ -200,9 +200,9 @@ var RangeFinder = Module("rangefinder", {
 
             get prompt() this.mode === modules.modes.FIND_BACKWARD ? "?" : "/",
 
-            onCancel: this.closure.onCancel,
-            onChange: this.closure.onChange,
-            onSubmit: this.closure.onSubmit
+            get onCancel() modules.rangefinder.closure.onCancel,
+            get onChange() modules.rangefinder.closure.onChange,
+            get onSubmit() modules.rangefinder.closure.onSubmit
         });
     },
     mappings: function (dactyl, modules, window) {
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 267ad6b2..3e3477b2 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -277,7 +277,11 @@ var Overlay = Module("Overlay", {
                     });
                 });
                 defineModule.modules.forEach(function (mod) {
-                    Object.keys(mod.INIT).forEach(function (name) {
+                    let names = set(Object.keys(mod.INIT));
+                    if ("init" in mod.INIT)
+                        set.add(names, "init");
+
+                    keys(names).forEach(function (name) {
                         deferredInit[name] = deferredInit[name] || [];
                         deferredInit[name].push(function () {
                             // util.dump("INIT: " + mod.constructor.className + ":" + name);