diff --git a/src/Decompression.cake b/src/Decompression.cake
index 3201f7a..14e4c3c 100644
--- a/src/Decompression.cake
+++ b/src/Decompression.cake
@@ -11,7 +11,7 @@
 
 (var g-known-num-puzzles (const int) 2577412)
 ;; This controls how many should be exported!
-(var g-num-puzzles-to-read (const int) 10)
+(var g-num-puzzles-to-read (const int) 50000)
 
 (var-global g-bunzip-debug bool false)
 
diff --git a/src/Main.cake b/src/Main.cake
index e91c06d..3c87325 100644
--- a/src/Main.cake
+++ b/src/Main.cake
@@ -1214,10 +1214,10 @@ Rush Hour database from Michael Fogleman.\n\n")
        (set exit-reason "Render error")))
 
     ;; Turn count
-    (draw-formatted-string (array 600.f 10.f) "%d/%d" g-current-move-count
+    (draw-formatted-string (array 570.f 15.f) "%d/%d" g-current-move-count
                            (? g-current-puzzle (path g-current-puzzle > num-moves) 0))
 
-    (draw-formatted-string (array 300.f 10.f) "%d" g-num-puzzles-won)
+    (draw-formatted-string (array 190.f 15.f) "%d" g-num-puzzles-won)
 
     (when g-show-fps ;; Frame rate
      (draw-formatted-string (array 700.f 2100.f) "%d" (type-cast (/ 1.f delta-time) int)))
@@ -1486,6 +1486,7 @@ This tool requires rsync to be installed.\n")
   (return true))
 
 ;; Order matters here, because we want to copy the generated puzzles list to android
+;; Cakelisp, however, doesn't seem to respect it (bug)
 (comptime-cond
  ('Kitty-Main
   (add-compile-time-hook-module pre-build generate-puzzles-list)