diff --git a/game.js b/game.js
index f5be043..d4b88a5 100644
--- a/game.js
+++ b/game.js
@@ -269,7 +269,8 @@ const effectRenderers = {
 /* Main Menu */
 
 function startScreen() {
-  cls()
+  cls(0)
+  map(0, 0, 30, 17)
 
   const title = 'Morse Pit'
   print(title, 12, 12, 3, false, 2)
@@ -285,25 +286,29 @@ function startScreen() {
 /* Gameover */
 
 function gameoverScreen() {
-  if (effects.length > 0) {
-    drawFX()
-    drawEnemies()
-    drawPlayer()
-  } else {
+  cls(0)
+  map(0, 0, 30, 17)
+  drawFX()
+  drawEnemies()
+  drawPlayer()
+
+  if (effects.length === 0) {
     const title = 'Game Over'
-    print(title, 12, SCREEN_H - 24, 10, false, 2)
+    print(title, 7, 118, 10, false)
+    print(player.score.toString().padStart(14, ' '), 152, 125, 6, true)
 
     if (anyKeyPressed()) {
       reset()
     }
   }
+  // }
 }
 
 function gameover() {
   effects = [
     {
       type: 'flash',
-      frames: '7777777777654321000000000000000000'.split(''),
+      frames: '77777777777765432'.split(''),
     },
   ]
   currentScreen = 'gameoverScreen'
@@ -332,7 +337,7 @@ function gameScreen() {
 
 function drawArena() {
   cls(0)
-  map(0, 0, 30, 17)
+  map(30, 0, 30, 17)
 }
 
 /* Interface */
@@ -340,7 +345,7 @@ function drawArena() {
 function drawInterface() {
   drawMorse(player.key.buffer, 100, 123, 15, 36)
 
-  print(player.key.history.padStart(HISTORY_LENGTH, ' '), 7, 118, 5, true)
+  print(player.key.history.padStart(HISTORY_LENGTH, ' '), 7, 118, 6, true)
   print(player.score.toString().padStart(14, ' '), 152, 125, 6, true)
 }
 
@@ -733,29 +738,38 @@ const BTN_Y = 7
  */
 
 // <TILES>
-// 001:0000000000000000000000000000000000000000000000000000044300000433
-// 002:0000000000000000000000000000000000000000000000003333333333333333
-// 003:0000000000000000000000000000000000000000000000000000000033333333
-// 004:0000000000000000000000000000000000000000000000030000003333333333
-// 005:0000333300033333003333330333333133333311333333333333333333333333
-// 006:3333333333333333111111111111111111111111333333333333333333333333
-// 007:3333333333333333111111131111113311111333333333333333333333333333
-// 008:3333333333333330333333113333311133331111333111133300003330000333
-// 009:0000333300033330113333001333300033330000333000003300000030000000
-// 010:3333003300000333333333330000000000000000000000000000000000000000
-// 011:3333333333333333333333300000000000000000000000000000000000000000
-// 012:3333333300000000000000000000000000000000000000000000000000000000
-// 013:3333333333333333000000000000000000000000000000000000000000000000
-// 014:3340000034400000000000000000000000000000000000000000000000000000
-// 016:0000000000000000000000000000000000000000000001110000012200000123
-// 017:0000000000000000000000000000000000000000111111112222222233333333
-// 018:0000000000000000000000000000000000000000111000002210000032100000
-// 032:0000012300000123000001230000012300000123000001230000012300000123
-// 033:2111111211111111111111111111111111111111111111111111111121111112
-// 034:3210000032100000321000003210000032100000321000003210000032100000
-// 048:0000012300000122000001110000000000000000000000000000000000000000
-// 049:3333333322222222111111110000000000000000000000000000000000000000
-// 050:3210000022100000111000000000000000000000000000000000000000000000
+// 001:0000000000000000000000000000000000000000000000000000055400000544
+// 002:0000000000000000000000000000000000000000000000004444444444444444
+// 003:0000000000000000000000000000000000000000000000000000000044444444
+// 004:0000000000000000000000000000000000000000000000040000004444444444
+// 005:0000444400044444004444440444444144444411444444444444444444444444
+// 006:4444444444444444111111111111111111111111444444444444444444444444
+// 007:4444444444444444111111141111114411111444444444444444444444444444
+// 008:4444444444444440444444114444411144441111444111144400004440000444
+// 009:0000444400044440114444001444400044440000444000004400000040000000
+// 010:4444004400000444444444440000000000000000000000000000000000000000
+// 011:4444444444444444444444400000000000000000000000000000000000000000
+// 012:4444444400000000000000000000000000000000000000000000000000000000
+// 013:4444444444444444000000000000000000000000000000000000000000000000
+// 014:4450000045500000000000000000000000000000000000000000000000000000
+// 016:0000000000000000000000000000000000000000000003330000030000000304
+// 017:0000000000000000000000000000000000000000000000000000000044444444
+// 018:0000000000000000000000000000000000000000333000000030000040300000
+// 019:0000000000000000000000000000000000000000000001110000012200000124
+// 020:0000000000000000000000000000000000000000111111112222222244444444
+// 021:0000000000000000000000000000000000000000111000002210000042100000
+// 032:0000000400000004000000040000000400000004000000040000000400000004
+// 033:3000000300000000000000000000000000000000000000000000000030000003
+// 034:4000000040000000400000004000000040000000400000004000000040000000
+// 035:0000012400000124000001240000012400000124000001240000012400000124
+// 036:2111111211111111111111111111111111111111111111111111111121111112
+// 037:4210000042100000421000004210000042100000421000004210000042100000
+// 048:0000030400000300000003330000000000000000000000000000000000000000
+// 049:4444444400000000000000000000000000000000000000000000000000000000
+// 050:4030000000300000333000000000000000000000000000000000000000000000
+// 051:0000012400000122000001110000000000000000000000000000000000000000
+// 052:4444444422222222111111110000000000000000000000000000000000000000
+// 053:4210000022100000111000000000000000000000000000000000000000000000
 // </TILES>
 
 // <SPRITES>
@@ -770,22 +784,22 @@ const BTN_Y = 7
 // </SPRITES>
 
 // <MAP>
-// 000:011111111111111111111111111111111111111111111111111111111121000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 001:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 002:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 003:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 004:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 005:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 006:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 007:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 008:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 009:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 010:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 011:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 012:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 013:021212121212121212121212121212121212121212121212121212121222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 014:031313131313131313131313131313131313131313131313131313131323000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-// 015:10202020303030303030304050606060708090a0b0c0c0c0c0c0c0c0d0e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 000:011111111111111111111111111111111111111111111111111111111121314141414141414141414141414141414141414141414141414141414151000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 001:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 002:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 003:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 004:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 005:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 006:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 007:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 008:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 009:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 010:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 011:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 012:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 013:021212121212121212121212121212121212121212121212121212121222324242424242424242424242424242424242424242424242424242424252000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 014:031313131313131313131313131313131313131313131313131313131323334343434343434343434343434343434343434343434343434343434353000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+// 015:10202020303030303030304050606060708090a0b0c0c0c0c0c0c0c0d0e010202020303030303030304050606060708090a0b0c0c0c0c0c0c0c0d0e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 // </MAP>
 
 // <WAVES>
@@ -942,5 +956,5 @@ const BTN_Y = 7
 // </SCREEN>
 
 // <PALETTE>
-// 000:000000002b36073642586e75657b8383949693a1a1ffffffb58900cb4b16dc322fd336826c71c4268bd22aa198859900
+// 000:000000002b3607364221292c586e75657b83839496ffffffb58900cb4b16dc322fd336826c71c4268bd22aa198859900
 // </PALETTE>