diff --git a/demos/zelda/App.Main.s b/demos/zelda/App.Main.s
index 65abe5f..5de7096 100644
--- a/demos/zelda/App.Main.s
+++ b/demos/zelda/App.Main.s
@@ -35,6 +35,7 @@ TSet EXT
                     stz   StartX
                     stz   StartY
 
+
                     sta   MyUserId                ; GS/OS passes the memory manager user ID for the application into the program
                     _MTStartUp                    ; GTE requires the miscellaneous toolset to be running
 
@@ -105,16 +106,28 @@ OKTOROK_SLOT_4      equ        4
                 pha
                 lda   PlayerY
                 pha
-                pea  HERO_SLOT
+                pea   HERO_SLOT
                 _GTEAddSprite
 
+                pea   HERO_SLOT
+                pea   $0000                       ; with these flags (h/v flip)
+                pea   HERO_DOWN_VBUFF             ; and use this stamp
+                _GTEUpdateSprite
+
 ; Add 4 octoroks 
                 pea   OKTOROK_ID
-                pea   #0
-                pea   #{32*256}+48
+                lda   OktorokX
+                pha
+                lda   OktorokY
+                pha
                 pea   OKTOROK_SLOT_1
                 _GTEAddSprite
 
+                pea   OKTOROK_SLOT_1
+                pea   $0000                       ; with these flags (h/v flip)
+                pea   OKTOROK_VBUFF               ; and use this stamp
+                _GTEUpdateSprite
+
 ; Draw the initial screen
 
                 _GTERender
@@ -136,7 +149,7 @@ EvtLoop
 
 ; Enable/disable v-sync
                 lda        1,s
-                bit        #$0400
+                bit        #PAD_KEY_DOWN
                 beq        :no_key_down
                 and        #$007F
                 cmp        #'v'
@@ -153,6 +166,7 @@ EvtLoop
                 bne        :not_q
                 brl        Exit
 :not_q
+                brl        EvtLoop
 
                 cmp        #'d'
                 bne        :not_d
diff --git a/demos/zelda/build-image.bat b/demos/zelda/build-image.bat
index 95a7ef9..dda3c92 100644
--- a/demos/zelda/build-image.bat
+++ b/demos/zelda/build-image.bat
@@ -14,5 +14,6 @@ REM Cadius does not overwrite files, so clear the root folder first
 
 REM Now copy files and folders as needed
 %CADIUS% ADDFILE %IMAGE% %FOLDER% .\GTEZelda
+%CADIUS% ADDFILE %IMAGE% %FOLDER% ..\..\src\Tool160
 
 REM Copy in the image assets
diff --git a/demos/zelda/package.json b/demos/zelda/package.json
index ae48d03..68d1f75 100644
--- a/demos/zelda/package.json
+++ b/demos/zelda/package.json
@@ -15,9 +15,11 @@
   "scripts": {
     "test": "npm run build && build-image.bat %npm_package_config_cadius% && %npm_package_config_gsport%",
     "debug": "%npm_package_config_crossrunner% GTEZelda -Source GTEZelda_S02_MAINSEG_Output.txt -Debug -CompatibilityLayer",
-    "build": "%npm_package_config_merlin32% -V %npm_package_config_macros% App.s",
+    "build:sys16": "%npm_package_config_merlin32% -V %npm_package_config_macros% App.s",
     "build:map": "node %npm_package_config_tiled2iigs% ./assets/overworld.json --no-gen-tiles --output-dir ./gen",
-    "build:tiles": "node %npm_package_config_png2iigs% ./assets/sprites-256x128.png --max-tiles 256 --as-tile-data --transparent-color FF00FF > ./gen/App.TileSet.s"
+    "build:tiles": "node %npm_package_config_png2iigs% ./assets/sprites-256x128.png --max-tiles 256 --as-tile-data --transparent-color FF00FF > ./gen/App.TileSet.s",
+    "build": "npm run build:tool && npm run build:sys16",
+    "build:tool": "%npm_package_config_merlin32% -V %npm_package_config_macros% ../../src/Master.s"
   },
   "repository": {
     "type": "git",