diff --git a/README.md b/README.md
index 7ec226f6e..4d23640e3 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,6 @@ Whether you're novice or pro, the CodeCombat team is ready to help you implement
 
 ----------
 
-[![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/challengepost.png)](http://codecombat.challengepost.com/?utm_source-github&utm_medium-oswidget&utm_campaign-codecombat)
+[![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/challengepost.png)](http://codecombat.challengepost.com/?utm_source=github&utm_medium=oswidget&utm_campaign=codecombat)
 
 [![](http://1-ps.googleusercontent.com/x/s.google-melange.appspot.com/www.google-melange.com/soc/content/2-1-20140225/images/gsoc/logo/920x156xbanner-gsoc2014.png.pagespeed.ic.gdr4t3Igca.png)](http://www.google-melange.com/gsoc/homepage/google/gsoc2014)
\ No newline at end of file
diff --git a/app/lib/God.coffee b/app/lib/God.coffee
index ff92f7e31..f7563517e 100644
--- a/app/lib/God.coffee
+++ b/app/lib/God.coffee
@@ -227,7 +227,7 @@ class Angel
       _.delay ->
         worker.terminate()
         worker.removeEventListener 'message', onWorkerMessage
-      , 2000
+      , 3000
       @worker = null
     @
 
diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee
index 008519599..3a56f77e7 100644
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@@ -252,7 +252,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
   updateAction: ->
     action = @determineAction()
     isDifferent = action isnt @currentRootAction
-    console.error "action is", action, "for", @thang?.id, "from", @currentRootAction, @thang.action, @thang.getActionName?() if not action and @thang?.actionActivated and @thang.id is 'Artillery'
+    if not action and @thang?.actionActivated and not @stopLogging
+      console.error "action is", action, "for", @thang?.id, "from", @currentRootAction, @thang.action, @thang.getActionName?()
+      @stopLogging = true
     @queueAction(action) if isDifferent or (@thang?.actionActivated and action.name isnt 'move')
     @updateActionDirection()
 
diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee
index 5ce3bf29c..ec006d449 100644
--- a/app/lib/surface/Surface.coffee
+++ b/app/lib/surface/Surface.coffee
@@ -502,6 +502,7 @@ module.exports = Surface = class Surface extends CocoClass
       # Skip some frame updates unless we're playing and not at end (or we haven't drawn much yet)
       frameAdvanced = (@playing and @currentFrame < @world.totalFrames) or @totalFramesDrawn < 2
       @currentFrame += @world.frameRate / @options.frameRate if frameAdvanced and @playing
+      @currentFrame = Math.min(@currentFrame, @world.totalFrames - 1)
       newWorldFrame = Math.floor @currentFrame
       worldFrameAdvanced = newWorldFrame isnt oldWorldFrame
       if worldFrameAdvanced
diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index b1d899a65..1f0584c85 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 72ca47fca..fd038c56c 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index aa32f0aa2..121f0da4f 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     tome_available_spells: "Dostupná kouzla"
     hud_continue: "Pokračovat (stiskněte shift-mezera)"
     spell_saved: "Kouzlo uloženo"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Administrátorský pohled"
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index 727e8d713..ad47c71fc 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     tome_available_spells: "Tilgængelige trylleformularer"
     hud_continue: "Fortsæt (tryk skift-mellemrum)"
     spell_saved: "Trylleformularen er gemt"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/de.coffee b/app/locale/de.coffee
index aebfcccbb..04b640ce8 100644
--- a/app/locale/de.coffee
+++ b/app/locale/de.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     tome_available_spells: "Verfügbare Zauber"
     hud_continue: "Weiter (drücke Shift + Leertaste)"
     spell_saved: "Zauber gespeichert"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Administrator Übersicht"
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index 5425164b7..91fd4be36 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee
index 9c115d83d..8c36e3ef7 100644
--- a/app/locale/en-AU.coffee
+++ b/app/locale/en-AU.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index 12bac5e6f..1da9d218a 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index e34074395..9d3b2dc5a 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 2afc376cd..5ca5cf902 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -199,8 +199,9 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     tome_select_spell: "Select a Spell"
     tome_select_a_thang: "Select Someone for "
     tome_available_spells: "Available Spells"
-    hud_continue: "Continue (press shift-space)"
+    hud_continue: "Continue (shift+space)"
     spell_saved: "Spell Saved"
+    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Admin Views"
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index 476b9fa7d..3c2614713 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index 5b911e4b1..e45550e08 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     tome_available_spells: "Hechizos disponibles"
     hud_continue: "Continuar (pulsa Shift+Space)"
     spell_saved: "Hechizo guardado"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/es.coffee b/app/locale/es.coffee
index fabd7b970..b4009323b 100644
--- a/app/locale/es.coffee
+++ b/app/locale/es.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index 36d6b4991..28a4bd760 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index 35af0bb25..57e5151e4 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index c869fbe8b..1469c7269 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tome_available_spells: "Sorts diponibles"
     hud_continue: "Continuer (appuie sur shift ou espace)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Vues d'administrateurs"
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index 5d39d1b87..ddcb7484c 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index abaae44c6..596ecd1ce 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index 39fb5c38d..ad6cd0273 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     tome_available_spells: "Elérhető varázslatok"
     hud_continue: "Folytatás (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index 4c21ab17c..20d16335f 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index e1ecb580f..a95f98916 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
     tome_available_spells: "Incantesimi disponibili"
     hud_continue: "Continua (premi Maiusc-Spazio)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Vista amministratore"
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index 47b10f118..4c9e4dfb9 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     tome_available_spells: "利用できる呪文"
     hud_continue: "続く　（Shift+Spaceキー）"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "管理画面"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index 9b0f4c9c4..882f3d4ac 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index a562a051c..1008a8bfb 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/ms-BA.coffee b/app/locale/ms-BA.coffee
index 861bce18e..29c914f23 100644
--- a/app/locale/ms-BA.coffee
+++ b/app/locale/ms-BA.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index 92ac6f932..db74e540d 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     tome_available_spells: "Tilgjenglige Trylleformularer"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/nl.coffee b/app/locale/nl.coffee
index 929741d23..508d6e384 100644
--- a/app/locale/nl.coffee
+++ b/app/locale/nl.coffee
@@ -201,6 +201,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     tome_available_spells: "Beschikbare spreuken"
     hud_continue: "Ga verder (druk shift-space)"
     spell_saved: "Spreuk Opgeslagen"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Administrator panels"
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index ceea3a0ea..c9e770bfa 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/no.coffee b/app/locale/no.coffee
index 4dcd77714..bc0e69e0c 100644
--- a/app/locale/no.coffee
+++ b/app/locale/no.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     tome_available_spells: "Tilgjenglige Trylleformularer"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index 826e5669c..9988be45e 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     tome_available_spells: "Dostępne czary"
     hud_continue: "Kontynuuj (naciśnij enter)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index e6a285655..40f374f81 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
     spell_saved: "Feitiço Salvo"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Visualização de Administrador"
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index 1ce48a42f..77fb7afad 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     tome_available_spells: "Feitiços disponíveis"
     hud_continue: "Continuar (pressiona shift-space)"
     spell_saved: "Feitiço Guardado"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Visualizações de Admin"
diff --git a/app/locale/pt.coffee b/app/locale/pt.coffee
index 9aedeae92..38a21790c 100644
--- a/app/locale/pt.coffee
+++ b/app/locale/pt.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 6a07f8345..6bdb8e75a 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -1,6 +1,6 @@
 module.exports = nativeDescription: "limba română", englishDescription: "Romanian", translation:
   common:
-    loading: "Loading..."
+    loading: "Se incarcă..."
     saving: "Se salvează..."
     sending: "Se trimite..."
     cancel: "Anulează"
@@ -53,8 +53,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 
   signup:
     create_account_title: "Crează cont pentru a salva progresul"
-    description: "Este gratis. Doar câte ceva inainte si poți continua:"#contextual translation a bit off, could be better# It's free. Just need a couple things and you'll be good to go:"
-    email_announcements: "Receive announcements by email"
+    description: "Este gratis. Doar un scurt formular inainte si poți continua:"#contextual translation a bit off, could be better# It's free. Just need a couple things and you'll be good to go:"
+    email_announcements: "Primește notificări prin emaill"
     coppa: "13+ sau non-USA "
     coppa_why: "(De ce?)"
     creating: "Se crează contul..."
@@ -63,7 +63,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 
   home:
     slogan: "Învață sa scri JavaScript jucându-te"# again sounds funny# Learn to Code JavaScript by Playing a Game"
-    no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
+    no_ie: "CodeCombat nu merge pe Internet Explorer 9 sau mai vechi. Scuze!"
     no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargâ!"
     play: "Joacâ"
 
@@ -78,59 +78,59 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     campaign_dev_description: "... în care se învață interfața, cu o dificultate puțin mai mare."
     campaign_multiplayer: "Arene Multiplayer"
     campaign_multiplayer_description: "... în care te lupți cap-la-cap contra alti jucători."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+    campaign_player_created: "Create de jucători"
+    campaign_player_created_description: "... în care ai ocazia să testezi creativitatea colegilor tai <a href=\"/contribute#artisan\">Artisan Wizards</a>."
+    level_difficulty: "Dificultate: "
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "Contact CodeCombat"
+    welcome: "Folosiți acest formular pentru a ne trimite email. "
+    contribute_prefix: "Dacă sunteți interesați in a contribui uitați-vă pe "
+    contribute_page: "pagina de contribuție"
+    contribute_suffix: "!"
+    forum_prefix: "Pentru orice altceva vă rugăm sa incercați "
+    forum_page: "forumul nostru"
+    forum_suffix: " în schimb."
+    send: "Trimite Feedback"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Romanian but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Romanian."
-    missing_translations: "Until we can translate everything into Romanian, you'll see English when Romanian isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    title: "Ajută-ne  să traducem CodeCombat!"
+    sub_heading: "Avem nevoie de abilitățile tale lingvistice."
+    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Romanian but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Romanian." #are these still needed??
+    missing_translations: "Until we can translate everything into Romanian, you'll see English when Romanian isn't available." # is this still needed?
+    learn_more: "Află mai multe despre cum să fi un Diplomat"
+    subscribe_as_diplomat: "Înscrie-te ca Diplomat"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
-#    clothes: "Clothes"
-#    trim: "Trim"
-#    cloud: "Cloud"
-#    spell: "Spell"
-#    boots: "Boots"
-#    hue: "Hue"
-#    saturation: "Saturation"
-#    lightness: "Lightness"
+  wizard_settings:
+    title: "Setări Wizard"
+    customize_avatar: "Personalizează-ți Avatarul"
+    clothes: "Haine"
+    trim: "Margine" 
+    cloud: "Nor"
+    spell: "Vrajă"
+    boots: "Încălțăminte"
+    hue: "Culoare"
+    saturation: "Saturație"
+    lightness: "Luminozitate"
 
-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    gravatar_select: "Select which Gravatar photo to use"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_notifications_description: "Get periodic notifications for your account."
+  account_settings:
+    title: "Setări Cont"
+    not_logged_in: "Loghează-te sau crează un cont nou pentru a schimba setările."
+    autosave: "Modificările se salvează automat"
+    me_tab: "Eu"
+    picture_tab: "Poză"
+    wizard_tab: "Wizard"
+    password_tab: "Parolă"
+    emails_tab: "Email-uri"
+    gravatar_select: "Selectează ce poză Gravatar vrei să foloșesti"
+    gravatar_add_photos: "Adaugă thumbnails și poze la un cont Gravatar pentru email-ul tău pentru a alege o imagine."
+    gravatar_add_more_photos: "Adaugă mai multe poze la contul tău Gravatar pentru a le accesa aici."
+    wizard_color: "Culoare haine pentru Wizard"
+    new_password: "Parolă nouă"
+    new_password_verify: "Verifică"
+    email_subscriptions: "Subscripție Email"
+    email_announcements: "Anunțuri"
+    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 985282a6c..57cfc1847 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tome_available_spells: "Доступные заклинания"
     hud_continue: "Продолжить (нажмите Shift+Пробел)"
     spell_saved: "Заклинание сохранено"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Админ панель"
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index 9050f2181..c9e3e4023 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index 97559521a..b0cbdd3f5 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index 179b74906..c9676fa65 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     tome_available_spells: "Доступне чини"
     hud_continue: "Настави (притисни ентер)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index b3868e937..d8b41ec50 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     tome_select_spell: "Välj en Förmåga"
     tome_select_a_thang: "Välj Någon för "
     tome_available_spells: "Tillgängliga Förmågor"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index 9fd74d3a0..9b2134eb8 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index 297c9f50d..4a256defe 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     tome_available_spells: "Kullanılabilir Büyüler"
     hud_continue: "Devam (ÜstKarakter+Boşluk)"
     spell_saved: "Büyü Kaydedildi"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Yönetici Görünümleri"
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index 3f3a375c7..bf67c2138 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
     tome_available_spells: "Доступні закляття"
     hud_continue: "Продовжити (натисніть shift-space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index d36ce12ec..8237971a3 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index 99992f8c5..c3a00a167 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 13c3d3161..f6eebce5d 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tome_available_spells: "可用的法术"
     hud_continue: "继续（按 Shift-空格）"
     spell_saved: "咒语已保存"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "管理员视图"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index aad8bbbf9..d38532973 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -200,6 +200,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     tome_available_spells: "可用的法術"
     hud_continue: "繼續 (按 shift-空格)"
     spell_saved: "咒語已儲存"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/locale/zh.coffee b/app/locale/zh.coffee
index f0afbd64b..aacf8fe4d 100644
--- a/app/locale/zh.coffee
+++ b/app/locale/zh.coffee
@@ -198,8 +198,9 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"
diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee
index 62f9eaa4e..b28bea773 100644
--- a/app/models/ThangType.coffee
+++ b/app/models/ThangType.coffee
@@ -157,7 +157,8 @@ module.exports = class ThangType extends CocoModel
     for groupName, config of options.colorConfig or {}
       colorConfigs.push "#{groupName}:#{config.hue}|#{config.saturation}|#{config.lightness}"
     colorConfigs = colorConfigs.join ','
-    "#{@get('name')} - #{options.resolutionFactor} - #{colorConfigs}"
+    portraitOnly = !!options.portraitOnly
+    "#{@get('name')} - #{options.resolutionFactor} - #{colorConfigs} - #{portraitOnly}"
 
   getPortraitImage: (spriteOptionsOrKey, size=100) ->
     src = @getPortraitSource(spriteOptionsOrKey, size)
diff --git a/app/styles/play/level/hud.sass b/app/styles/play/level/hud.sass
index 4f6a5fea3..0379fc151 100644
--- a/app/styles/play/level/hud.sass
+++ b/app/styles/play/level/hud.sass
@@ -251,10 +251,7 @@
 
         .hud-hint
           font-weight: normal
-          color: #aaa
-          position: absolute
-          top: 0
-          right: 4px
+          color: #999
 
         .enter
           position: absolute
diff --git a/app/views/play/level/hud_view.coffee b/app/views/play/level/hud_view.coffee
index 7b036c433..1951e3539 100644
--- a/app/views/play/level/hud_view.coffee
+++ b/app/views/play/level/hud_view.coffee
@@ -175,9 +175,10 @@ module.exports = class HUDView extends View
         group.append(button)
         response.button = $('button:last', group)
     else
-      s = $.i18n.t('play_level.hud_continue', defaultValue: "Continue (press shift-space)")
-      if @shiftSpacePressed > 4 and not @escapePressed
-        @bubble.append('<span class="hud-hint">skip: esc</span>')
+      s = $.i18n.t('play_level.hud_continue', defaultValue: "Continue (shift+space)")
+      sk = $.i18n.t('play_level.skip_tutorial', defaultValue: "skip: esc")
+      if not @escapePressed
+        group.append('<span class="hud-hint">' + sk + '</span>')
       group.append($('<button class="btn btn-small banner with-dot">' + s + ' <div class="dot"></div></button>'))
       @lastResponses = null
     @bubble.append($("<h3>#{@speaker ? 'Captain Anya'}</h3>"))