diff --git a/app.js b/app.js
index d15af73684..18a6516ce4 100644
--- a/app.js
+++ b/app.js
@@ -310,10 +310,12 @@ app.post('/completed-bonfire/', function (req, res) {
     };
 
     if (isCompletedWith) {
-        User.findOne({"profile.username": isCompletedWith}, function(err, pairedWith) {
+        var paired = User.find({"profile.username": isCompletedWith}).limit(1);
+        paired.exec(function(err, pairedWith) {
             if (err) {
                 return err;
             } else {
+                pairedWith = pairedWith.pop();
                 pairedWith.bonfiresHash[bonfireHash] = {
                     completedWith: req.user._id,
                     completedDate: isCompletedDate,
diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index 866fdc87cb..34311cb3a3 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -50,7 +50,7 @@ exports.returnBonfire = function(req, res, next) {
     ];
 
     if (bonfireNumber > highestBonfireNumber) { bonfireNumber = 0; }
-    Bonfire.find({}, null, { sort: { bonfireNumber: 1 } }, function(err, bonfire) {
+    Bonfire.find({}, null, { sort: { difficulty: 1, bonfireNumber: 1 } }, function(err, bonfire) {
         debug(bonfire[bonfireNumber].challengeEntryPoint);
         if (err) {
             next(err);
diff --git a/public/js/main.js b/public/js/main.js
index 5c8b5c6c3e..b333e61ad6 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -50,7 +50,6 @@ $(document).ready(function() {
                 },
                 url: '/completed-bonfire/'
             });
-            console.log(didCompleteWith, bonfireSolution, thisBonfireHash); // TODO: remove debug statement
         }
     }