diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee
index c55032517..24686d354 100644
--- a/app/lib/surface/Surface.coffee
+++ b/app/lib/surface/Surface.coffee
@@ -450,6 +450,7 @@ module.exports = Surface = class Surface extends CocoClass
     @gridLayer?.parent?
 
   onToggleGrid: (e) ->
+    # TODO: figure out a better way of managing grid / debug so it's not split across PlaybackView and Surface
     e?.preventDefault?()
     if @gridShowing() then @hideGrid() else @showGrid()
     flag = $('#grid-toggle i.icon-ok')
diff --git a/server/routes/auth.coffee b/server/routes/auth.coffee
index c845b28c2..dcb8ea12a 100644
--- a/server/routes/auth.coffee
+++ b/server/routes/auth.coffee
@@ -25,7 +25,7 @@ module.exports.setup = (app) ->
 
         hash = User.hashPassword(password)
         unless user.get('passwordHash') is hash
-          return done(null, false, {message:'is wrong, wrong, wrong', property:'password'})
+          return done(null, false, {message:'is wrong.', property:'password'})
         return done(null, user)
       )
   ))