diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index 86421feeaa..a4fbabad51 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -7,6 +7,7 @@ var _ = require('lodash'),
  */
 exports.index = function(req, res) {
   res.render('bonfire/bonfire.jade', {
+      title: 'Learn to code with Bonfire - Free Code Camp'
   });
   //Bonfire.find({}, null, { sort: { bonfireNumber: 1 } }, function(err, c) {
   //  if (err) {
diff --git a/public/js/lib/bonfire/bonfire.js b/public/js/lib/bonfire/bonfire.js
index 720adb22c9..19be8fb116 100644
--- a/public/js/lib/bonfire/bonfire.js
+++ b/public/js/lib/bonfire/bonfire.js
@@ -43,6 +43,7 @@ var api = {
       //print('input', data.input);
       if (data.error) {
           print('Error', data);
+          reset();
       } else {
           print(null, data);
       }
diff --git a/public/js/lib/bonfire/framework.js b/public/js/lib/bonfire/framework.js
index cd60546f2f..726894d387 100644
--- a/public/js/lib/bonfire/framework.js
+++ b/public/js/lib/bonfire/framework.js
@@ -14,7 +14,7 @@ var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor")
     onKeyEvent: doLinting,
     extraKeys : {
         "Ctrl-Enter" : function() {
-            submit(myCodeMirror.getValue());
+            bonfireExecute();
             return false;
         }
     }
@@ -104,6 +104,10 @@ var scrapeTests = function(js) {
 };
 
 $('#submitButton').on('click', function () {
+    bonfireExecute();
+});
+
+function bonfireExecute() {
     tests = undefined;
     $('#codeOutput').empty();
     var js = myCodeMirror.getValue();
@@ -118,7 +122,7 @@ $('#submitButton').on('click', function () {
             runTests(null, message);
         }
     });
-});
+}
 
 var pushed = false;
 var createTestDisplay = function() {