diff --git a/programs/games/codemaster/ReadMe.txt b/programs/games/codemaster/ReadMe.txt
index a82e78f290..1c10cd09cb 100644
--- a/programs/games/codemaster/ReadMe.txt
+++ b/programs/games/codemaster/ReadMe.txt
@@ -28,7 +28,7 @@ _for_Kolibri_ on Windows
 * 24-27 years of programming experience,
 recreationally in my freetime. Made 1,000s of
 programs, given 100s of examples away for free
-while poor. Never been paid.
+while poor. Never been paid for programming.
 
 Thanks. Happy new years!
 ===========================================================
diff --git a/programs/games/codemaster/build.bat b/programs/games/codemaster/build.bat
new file mode 100644
index 0000000000..c5a2d0f8f7
--- /dev/null
+++ b/programs/games/codemaster/build.bat
@@ -0,0 +1,9 @@
+@echo lang fix en >lang.inc
+@fasm -m 65536 binary_master.asm binary_master
+@fasm -m 65536 hang_programmer.asm hang_programmer
+@fasm -m 65536 kolibri_puzzle.asm kolibri_puzzle
+@erase lang.inc
+@kpack binary_master
+@kpack hang_programmer
+@kpack kolibri_puzzle
+@pause
\ No newline at end of file
diff --git a/programs/games/codemaster/include/image.inc b/programs/games/codemaster/include/image.inc
index 7418ff875c..94c93fa1ec 100644
--- a/programs/games/codemaster/include/image.inc
+++ b/programs/games/codemaster/include/image.inc
@@ -68,7 +68,7 @@ macro inject.image name, bpp {
   local i, p, a, r, g, b,\
    x, y, w, h, wb
   virtual at 0
-    p:: file CD#'/media/'#name#'.bmp'
+    p:: file CD#'media/'#name#'.bmp'
   END virtual
   IF ~bpp in <15,16,24,32>
     'Invalid BPP' name
@@ -125,7 +125,7 @@ macro inject.image.8 name {
   local i, p, a, c,\
    x, y, w, h, wb
   virtual at 0
-    p:: file CD#'/media/'#name#'.bmp'
+    p:: file CD#'media/'#name#'.bmp'
   END virtual
   load a word from p:0
   IF a<>'BM'
diff --git a/programs/games/codemaster/include/imagek.inc b/programs/games/codemaster/include/imagek.inc
index ebbc167deb..365ce00092 100644
--- a/programs/games/codemaster/include/imagek.inc
+++ b/programs/games/codemaster/include/imagek.inc
@@ -68,7 +68,7 @@ macro inject.image name, bpp {
   local i, p, a, r, g, b,\
    x, y, w, h, wb
   virtual at 0
-    p:: file CD#'/media/'#name#'.bmp'
+    p:: file CD#'media/'#name#'.bmp'
   END virtual
   IF ~bpp in <15,16,24,32>
     'Invalid BPP' name
@@ -125,7 +125,7 @@ macro inject.image.8 name {
   local i, p, a, c,\
    x, y, w, h, wb
   virtual at 0
-    p:: file CD#'/media/'#name#'.bmp'
+    p:: file CD#'media/'#name#'.bmp'
   END virtual
   load a word from p:0
   IF a<>'BM'
diff --git a/programs/games/codemaster/kolibri_puzzle.asm b/programs/games/codemaster/kolibri_puzzle.asm
index 26679845c0..3e269aff17 100644
--- a/programs/games/codemaster/kolibri_puzzle.asm
+++ b/programs/games/codemaster/kolibri_puzzle.asm
@@ -49,7 +49,8 @@ function randomize.puzzle
   alias p=r0, x=r1
   . q=puzzle, n=(MAP.W*MAP.H)
   loop n
-    . x=ROTATE.L, p=q, (u32) *p=x, q+4
+    get x=get.random
+    . p=q, (u32) *p=x, q+4
   endl
 endf