diff --git a/warehouse/main.c b/warehouse/main.c
index 2fb62b1..2252dce 100644
--- a/warehouse/main.c
+++ b/warehouse/main.c
@@ -244,6 +244,13 @@ void gamePlay(void) {
 					}
 					break;
 
+				case 13:
+					if (1 == menuHandle("Reset Level?", menuReset, 0)) {
+						puzzleReset();
+						puzzleForceFullRedraw();
+					}
+					break;
+
 				case 'I':
 				case 'i':
 					// Can we move up?
@@ -709,10 +716,17 @@ void puzzleLoad(void) {
 				avatarY = y;
 			}
 			// Get crate tallys.
-			if ((puzzle.puzzle[x][y] == TILE_CRATE) || (puzzle.puzzle[x + 1][y] == TILE_CRATE)) {
+			if (puzzle.puzzle[x][y] == TILE_CRATE) {
 				crateCount++;
 			}
-			if ((puzzle.puzzle[x][y] == TILE_CRATE_ON_GOAL) || (puzzle.puzzle[x + 1][y] == TILE_CRATE_ON_GOAL)) {
+			if (puzzle.puzzle[x + 1][y] == TILE_CRATE) {
+				crateCount++;
+			}
+			if (puzzle.puzzle[x][y] == TILE_CRATE_ON_GOAL) {
+				crateCount++;
+				cratesOnTarget++;
+			}
+			if (puzzle.puzzle[x + 1][y] == TILE_CRATE_ON_GOAL) {
 				crateCount++;
 				cratesOnTarget++;
 			}