diff --git a/res/DEMO/BATTLEZONE b/res/DEMO/BATTLEZONE
index b0766ef11..f63d47cd2 100644
Binary files a/res/DEMO/BATTLEZONE and b/res/DEMO/BATTLEZONE differ
diff --git a/res/DEMO/GALAXIAN b/res/DEMO/GALAXIAN
index 2f996b5a5..cbbd03f93 100644
Binary files a/res/DEMO/GALAXIAN and b/res/DEMO/GALAXIAN differ
diff --git a/res/DEMO/PITFALL.II b/res/DEMO/PITFALL.II
index e5bff0367..e996fefdc 100755
Binary files a/res/DEMO/PITFALL.II and b/res/DEMO/PITFALL.II differ
diff --git a/res/DEMO/TB b/res/DEMO/TB
index d523240ff..5ba868da4 100755
Binary files a/res/DEMO/TB and b/res/DEMO/TB differ
diff --git a/src/demo/battlezone.a b/src/demo/battlezone.a
index bc4579645..bb8849ac7 100644
--- a/src/demo/battlezone.a
+++ b/src/demo/battlezone.a
@@ -36,7 +36,7 @@
          bpl   -
 
          ldx   #4-1
-         lda   patch2,x
+-        lda   patch2,x
          sta   $168F,x    ; set exits
          dex
          bpl   -
diff --git a/src/demo/galaxian.a b/src/demo/galaxian.a
index b1cb9ff23..d558deda3 100644
--- a/src/demo/galaxian.a
+++ b/src/demo/galaxian.a
@@ -3,7 +3,7 @@
 
 !cpu 6502
 !to "res/DEMO/GALAXIAN",plain
-*=$300
+*=$320
 
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
diff --git a/src/demo/pitfall.ii.a b/src/demo/pitfall.ii.a
index 68a0743cb..a62dd2dff 100644
--- a/src/demo/pitfall.ii.a
+++ b/src/demo/pitfall.ii.a
@@ -19,10 +19,6 @@
          +RESET_VECTOR reset
          ldx   #3-1
 -        lda   patch,x
-         sta   $2DF5,x
-         lda   patch2,x
-         sta   $2E06,x
-         lda   patch3,x
          sta   $6015,x
          dex
          bpl   -
@@ -31,30 +27,13 @@
 
          jmp   $6000      ;612A copies pages 2E & 2F to AE & AF for final location
 
-patch    !byte $4C,<callback1,>callback1
-patch2   !byte $4C,<callback2,>callback2
-patch3   !byte $4C,<callback3,>callback3
+patch    !byte $20,<callback,>callback
 
 reset
          +READ_RAM2_NO_WRITE
          jmp   ($FFFC)
 
-callback1
-         sec
-         sbc   #8
-         cmp   #2
-         bcc   +
--        jmp   $AE0A
-+        jmp   $ADF9
-
-callback2
-         sec
-         sbc   #8
-         cmp   #2
-         bcs   -
-         jmp   $AE21
-
-callback3
+callback
          ldx   #6-1
 p1       lda   $100, x
          sta   $6055, x
diff --git a/src/demo/tubeway.a b/src/demo/tubeway.a
index aa1ed7e7c..85dc3a884 100644
--- a/src/demo/tubeway.a
+++ b/src/demo/tubeway.a
@@ -9,8 +9,9 @@
          !source "src/macros.a"
 
          +GAME_REQUIRES_JOYSTICK
-         +ENABLE_ACCEL_LC
-         +LOAD_XSINGLE title
+         +READ_RAM2_WRITE_RAM2
+         jsr   EnableAccelerator
+         +LOAD_FILE_AT title, $00
          lda   #$4C
          sta   $6BA8
          sta   $6C2D
@@ -25,6 +26,10 @@
          sta   $AC64,x
          dex
          bpl   -
+         inx
+         stx   $B3F0
+         stx   $B3F1
+         stx   $B3F2    ; erase high score
          lda   #$10
          sta   $AD28
          sta   $AB84
@@ -42,7 +47,7 @@
 patch    !byte $4C,$00,$01
 
 title    !byte x_e-x_b
-x_b      !text "TB"
+x_b      !text "X/TB/TB"
 x_e
 
 !if * > $3F0 {