diff --git a/demo/boot.js b/demo/boot.js
index 9c577c9b..8da8d05b 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -58,10 +58,10 @@ require(deps, function() {
     catalog.registerPlugins(plugins).then(function() {
         var env = require("ace/environment").create();
         catalog.startupPlugins({ env: env }).then(function() {
-            var gcli = require("gcli/index");
-            new gcli.CliView({ env: env });
-
             require("demo/demo").launch(env);
+
+            var gcli = require("gcli/index");
+            gcli.createView({ env: env });
         });
     });
 });
diff --git a/lib/ace/commands/settings.js b/lib/ace/commands/settings.js
index 843ee817..58e660b5 100644
--- a/lib/ace/commands/settings.js
+++ b/lib/ace/commands/settings.js
@@ -69,24 +69,22 @@ var pref = {
 
         var html = '';
         names.forEach(function(name) {
-            if (filter && !filter.test(name)) {
-                return;
+            if (!filter || filter.test(name)) {
+                var setting = gcli.getEnvironment().settings.getSetting(name);
+                var url = 'https://wiki.mozilla.org/Labs/Skywriter/Settings#' +
+                        setting.name;
+                html += '<a class="setting" href="' + url +
+                        '" title="View external documentation on setting: ' +
+                        setting.name +
+                        '" target="_blank">' +
+                        setting.name +
+                        '</a> = ' +
+                        setting.value +
+                        '<br/>';
             }
-
-            var setting = gcli.getEnvironment().settings.getSetting(name);
-            var url = 'https://wiki.mozilla.org/Labs/Skywriter/Settings#' +
-                    setting.name;
-            html += '<a class="setting" href="' + url +
-                    '" title="View external documentation on setting: ' +
-                    setting.name +
-                    '" target="_blank">' +
-                    setting.name +
-                    '</a> = ' +
-                    setting.value +
-                    '<br/>';
         });
 
-        gcli.getRequest().done(html);
+        return html;
     },
 
     setMetadata: {
@@ -106,8 +104,7 @@ var pref = {
     },
     set: function(setting, value) {
         setting.set(value);
-        gcli.getRequest().done('Setting: <strong>' + setting.name +
-            '</strong> = ' + setting.get());
+        return 'Setting: <b>' + setting.name + '</b> = ' + setting.get();
     },
 
     resetMetadata: {
@@ -122,7 +119,7 @@ var pref = {
     },
     reset: function(setting) {
         setting.reset();
-        request.done('Reset ' + setting.name + ' to default: ' + setting.value);
+        return 'Reset ' + setting.name + ' to default: ' + setting.value;
     }
 };
 
diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/test/event_emitter_test.js
index 19e12596..eb0e64ce 100644
--- a/lib/ace/test/event_emitter_test.js
+++ b/lib/ace/test/event_emitter_test.js
@@ -51,14 +51,31 @@ var Test = {
 
         var called = false;
         emitter.addEventListener("juhu", function(e) {
-           called = true;
-           assert.equal(e.type, "juhu");
+            called = true;
+            assert.equal(e.type, "juhu");
         });
 
         emitter._dispatchEvent("juhu");
         assert.ok(called);
+    },
+
+    "test: single dispatch" : function() {
+        var real = new Emitter();
+        var ignored = new Emitter();
+
+        var calls = 0;
+        real.addEventListener("juhu", function(e) {
+            calls++;
+            assert.equal(e.type, "juhu");
+        });
+
+        real._dispatchEvent("juhu");
+        real._dispatchEvent("juhu");
+
+        assert.equal(2, calls);
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test)
+module.exports = require("asyncjs/test").testcase(Test);
+
 });
\ No newline at end of file
diff --git a/support/cockpit b/support/cockpit
index 5ab8377d..178ecab7 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 5ab8377de0c2b6bf31e4295e5bb9288cb943e8e8
+Subproject commit 178ecab78b8c5ffd7cbe09477976165d053c5e0e