diff --git a/Makefile b/Makefile
index 70654f116..ccc2ea57c 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ dsk: asm
 	bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.IDX" >>build/log
 	bin/buildfx.sh "res/FX.CONF" "build/FX.IDX" "build/FX.ALL" "build/FX" >>build/log
 	bin/buildfx.sh "res/DFX.CONF" "build/DFX.IDX" "build/DFX.ALL" "build/FX" >>build/log
-	bin/buildhelp.sh "res/GAMES.CONF" "build/GAMEHELP.IDX" "build/GAMEHELP.ALL" "res/GAMEHELP" >>build/log
+	for f in res/GAMEHELP/*; do tr "\*\~\<\>\$$\%\[" "\020\021\010\025\016\017\000" < "$$f" > build/GAMEHELP/"$$(basename $$f)"; done >>build/log
+	bin/buildhelp.sh "res/GAMES.CONF" "build/GAMEHELP.IDX" "build/GAMEHELP.ALL" "build/GAMEHELP" >>build/log
 	rm -f build/SSDIR.CONF && touch build/SSDIR.CONF >>build/log
 	for f in res/SS/*; do bin/buildokvs.sh "$$f" "build/SS/$$(basename $$f)" && echo "$$(basename $$f)" >> build/SSDIR.CONF; done >>build/log
 	bin/buildfx.sh "build/SSDIR.CONF" "build/SLIDESHOW.IDX" "build/SLIDESHOW.ALL" "build/SS" >>build/log
@@ -89,7 +90,7 @@ mount: dsk
 	osascript bin/V2Make.scpt "`pwd`" bin/4cade.vii build/"$(DISK)"
 
 md:
-	mkdir -p build/X build/FX build/PRELAUNCH build/ATTRACT build/SS
+	mkdir -p build/X build/FX build/PRELAUNCH build/ATTRACT build/SS build/GAMEHELP
 	touch build/log
 
 clean:
diff --git a/res/DEMO/ALIEN.DOWNPOUR b/res/DEMO/ALIEN.DOWNPOUR
index a9fcf2a1a..aa738f14a 100755
Binary files a/res/DEMO/ALIEN.DOWNPOUR and b/res/DEMO/ALIEN.DOWNPOUR differ
diff --git a/res/DEMO/CHOPLIFTER b/res/DEMO/CHOPLIFTER
index d53c9e96c..947b1ae49 100755
Binary files a/res/DEMO/CHOPLIFTER and b/res/DEMO/CHOPLIFTER differ
diff --git a/res/DEMO/NIGHT.STALKER b/res/DEMO/NIGHT.STALKER
index c77567304..6cff564eb 100755
Binary files a/res/DEMO/NIGHT.STALKER and b/res/DEMO/NIGHT.STALKER differ
diff --git a/res/DEMO/SNEAKERS b/res/DEMO/SNEAKERS
index e7867f3c1..ed2accca5 100644
Binary files a/res/DEMO/SNEAKERS and b/res/DEMO/SNEAKERS differ
diff --git a/res/DEMO/SPACE.QUARKS b/res/DEMO/SPACE.QUARKS
index 3d48f556a..100e89461 100755
Binary files a/res/DEMO/SPACE.QUARKS and b/res/DEMO/SPACE.QUARKS differ
diff --git a/res/DEMO/TB b/res/DEMO/TB
index 96660eb01..7fe81c9b7 100755
Binary files a/res/DEMO/TB and b/res/DEMO/TB differ
diff --git a/res/DEMO/WAVY.NAVY b/res/DEMO/WAVY.NAVY
index 1c2dddbe4..d410a784d 100644
Binary files a/res/DEMO/WAVY.NAVY and b/res/DEMO/WAVY.NAVY differ
diff --git a/res/HELPTEXT b/res/HELPTEXT
index 1680919e4..11d72fa25 100644
Binary files a/res/HELPTEXT and b/res/HELPTEXT differ
diff --git a/src/constants.a b/src/constants.a
index 78c5d79a2..86600a474 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -17,7 +17,7 @@
 ; D000..D3FF - ProRWTS data
 ; D400..D66F - ProRWTS code
 ; D670..DB91 - HGR font code & ProRWTS glue code
-; DB92..DBA1 - backup of stack (during gameplay and self-running demos)
+; DB72..DB81 - backup of stack (during gameplay and self-running demos)
 ; ...unused...
 ; DBB4..DBFF - (de)acceleration function
 ; DC00..DFFF - HGR font data
@@ -148,7 +148,7 @@ CHEATS_ENABLED = %00001000
 iCurBlockLo    = $D401
 iCurBlockHi    = $D403
 iProDOS_enter  = $D670
-LoadFileDirect = $DAF4
+LoadFileDirect = $DAD4
 launchpatch    = $D60E
 iAddToPath     = $FE67
 itraverse      = $D8D8
diff --git a/src/macros.a b/src/macros.a
index 7e3541e28..41de6db18 100755
--- a/src/macros.a
+++ b/src/macros.a
@@ -10,7 +10,8 @@
 ; for functions that take parameters on the stack
 ; set (PARAM) to point to the parameters and
 ; move the stack pointer to the first byte after the parameters
-; clobbers A,X,Y
+; clobbers A,Y
+; preserves X
 !macro   PARAMS_ON_STACK .bytes {
          pla
          sta   PARAM
diff --git a/src/ui.font.lc2.a b/src/ui.font.lc2.a
index 0958ce0b2..f22dff609 100644
--- a/src/ui.font.lc2.a
+++ b/src/ui.font.lc2.a
@@ -29,21 +29,10 @@ DrawPageInternal
          sta   HTAB
          ldy   #0
 @parseLine
-         lda   (PTR),y
-         cmp   #$5B                  ; '[' at beginning on line
-         bne   +                     ; ends the parsing
-         tya
+         lda   (PTR), y
          beq   @donePage
-+        cmp   #$0A
+         cmp   #$0A
          beq   @doneParsingLine
-         ldx   #5
--        cmp   @subs_a,x
-         bne   @nosub
-         lda   @subs_b,x
-         sta   (PTR),y
-@nosub
-         dex
-         bpl   -
          iny
          bne   @parseLine
 @doneParsingLine
@@ -67,10 +56,6 @@ DrawPageInternal
 @donePage
          plp
          rts
-@subs_a
-         !byte $2A,$7E,$3C,$3E,$24,$25
-@subs_b
-         !byte $10,$11,$08,$15,$0E,$0F
 
 Draw40CharsInternal
 ; A/Y contains address of character buffer