diff --git a/Binary/Apps/Clean.cmd b/Binary/Apps/Clean.cmd
index cf656f2a..1427d697 100644
--- a/Binary/Apps/Clean.cmd
+++ b/Binary/Apps/Clean.cmd
@@ -2,5 +2,5 @@
 setlocal
 
 if exist *.com del *.com
-
-setlocal & cd Tunes && call Clean || exit /b 1 & endlocal
+if exist Tunes\*.pt? del Tunes\*.pt?
+if exist Tunes\*.mym del Tunes\*.mym
diff --git a/Binary/Apps/Makefile b/Binary/Apps/Makefile
index ea259d94..5769cf21 100644
--- a/Binary/Apps/Makefile
+++ b/Binary/Apps/Makefile
@@ -7,4 +7,4 @@ all::
 	mkdir -p Tunes
 
 clean::
-	rm -f *.bin *.com *.img *.rom *.pdf *.log *.eeprom *.COM *.BIN Tunes/*
+	rm -f *.bin *.com *.img *.rom *.pdf *.log *.eeprom *.COM *.BIN Tunes/*.mym Tunes/*.pt?
diff --git a/Binary/Apps/Tunes/Clean.cmd b/Binary/Apps/Tunes/Clean.cmd
deleted file mode 100644
index 3039d346..00000000
--- a/Binary/Apps/Tunes/Clean.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-setlocal
-
-if exist *.pt? del *.pt?
-if exist *.mym del *.mym
diff --git a/Source/BPBIOS/Makefile b/Source/BPBIOS/Makefile
index 8fddd3f5..d1b0c403 100644
--- a/Source/BPBIOS/Makefile
+++ b/Source/BPBIOS/Makefile
@@ -10,7 +10,7 @@ IMGFILES = $(foreach ver,$(VERSIONS),bp$(ver).img)
 DISTFILES = *.zex *.rel myterm.z3t
 
 OTHERS = zcpr33n.rel zcpr33t.rel \
-	bpbio-ww.rel bpsys.dat bpsys.bak bpbio-ww.err def-ww.lib
+	bpbio-ww.rel bpsys.dat bpsys.bak bpbio-ww.err def-ww.lib *.img
 
 TOOLS = ../../Tools
 
diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index 3c134d52..8d8b4b73 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -6,6 +6,7 @@
 #
 OBJECTS = cpmldr.com cpmldr.sys cpm3res cpm3bnk zpmbios3 cpm3.sys gencpm.dat
 OTHERS = cpmldr.rel biosldr.rel cpm3res.sys cpm3bnk.sys zpmbios3.spr loader.bin cpmldr.bin
+OTHERS += biosldrc.rel biosldrd.rel
 
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
@@ -21,7 +22,7 @@ DEFCPM3 = bnk
 #DEFCPM3 = res
 
 clean:: biosclean
-	@rm -f bios3.spr bnkbios3.spr zpmbios3.spr cpmldr.com gencpm.dat options.lib
+	@rm -f bios3.spr bnkbios3.spr zpmbios3.spr cpmldr.com gencpm.dat options.lib ldropts.lib
 
 biosclean:
 	@rm -f $(BIOSOBJS)
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index b598a3b3..2e08160c 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -29,7 +29,7 @@ MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \
 SUBDIRS = 
 DEST = ../../Binary
 TOOLS =../../Tools
-OTHERS =  *.img *.rom *.com *.bin *.z80 cpm.sys zsys.sys Build.inc
+OTHERS =  *.img *.rom *.com *.bin *.z80 cpm.sys zsys.sys Build.inc RomDisk.tmp font*.asm
 include $(TOOLS)/Makefile.inc
 DIFFPATH = $(DIFFTO)/Binary
 
diff --git a/Source/HBIOS/sd.asm b/Source/HBIOS/sd.asm
index 2930fa72..5cf837e8 100644
--- a/Source/HBIOS/sd.asm
+++ b/Source/HBIOS/sd.asm
@@ -1639,7 +1639,9 @@ SD_SELECT2:
 SD_DESELECT:
 	LD	A,(SD_OPRVAL)
 #IF (SD_DEVCNT > 1)
-	AND	~(SD_CS0 | SD_CS1)
+;	AND	~(SD_CS0 | SD_CS1)
+SD_CS	.EQU	(SD_CS0 | SD_CS1)	; HACK TO WORK AROUND UZ80AX EXPRESSION EVAL ISSUE
+	AND	~SD_CS
 #ELSE
 	AND	~SD_CS0
 #ENDIF
diff --git a/Source/ZPM3/Makefile b/Source/ZPM3/Makefile
index 0574dfa0..d72e77bd 100644
--- a/Source/ZPM3/Makefile
+++ b/Source/ZPM3/Makefile
@@ -1,6 +1,7 @@
-OBJECTS = zpmldr.com zpmldr.sys cpm3.sys startzpm.com zccp.com \
-	setz3.com clrhist.com autotog.com
-ifndef REBUILD_ZPM_TOOLS
+OBJECTS = zpmldr.com zpmldr.sys cpm3.sys startzpm.com zccp.com
+ifdef REBUILD_ZPM_TOOLS
+OBJECTS += setz3.com clrhist.com autotog.com
+else
 NODELETE = setz3.com clrhist.com autotog.com
 endif
 OTHERS = zpmldr.bin loader.bin biosldrd.rel biosldrc.rel gencpm.com gencpm.dat bnkbios3.spr
@@ -46,10 +47,8 @@ zinstal.zpm: ../ZCCP/zinstal.zpm
 startzpm.com: ../ZCCP/startzpm.com
 	cp $< $@
 
-ifdef REBUILD_ZPM_TOOLS
 setz3.com: setz3.z80
 
 clrhist.com: clrhist.z80
 
 autotog.com: autotog.z80
-endif
diff --git a/Source/ZPM3/autotog.z80 b/Source/ZPM3/autotog.z80
index 48977581..b59a6663 100644
--- a/Source/ZPM3/autotog.z80
+++ b/Source/ZPM3/autotog.z80
@@ -45,13 +45,13 @@ ACPoff	equ	85h	; Offset in SCB base page of Auto Command Prompting bit
 HELPmsg:
 	db	' SYNTAX:'
 	db	10,13
-	db	'  AUTOTOG',9,'Toggles the state of the Auto Command Prompting'
+	db	'  AUTOTOG	Toggles the state of the Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG ON',9,'Enables Auto Command Prompting'
+	db	'  AUTOTOG ON	Enables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG OFF',9,'Disables Auto Command Prompting'
+	db	'  AUTOTOG OFF	Disables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG //',9,'Displays a brief help message'
+	db	'  AUTOTOG //	Displays a brief help message'
 	db	'$'
 ONmsg:
 	db	'ZPM3 Auto Command Prompting is now enabled. Toggle with ^Q.'
@@ -128,4 +128,4 @@ ACPaddr:	; Save the address of the ACP bit here too.
 	db	03bh
 	db	0		; Get operation
 
-
+
\ No newline at end of file
diff --git a/Source/ZSDOS/Makefile b/Source/ZSDOS/Makefile
index 4d7421ba..90963e9d 100644
--- a/Source/ZSDOS/Makefile
+++ b/Source/ZSDOS/Makefile
@@ -1,7 +1,7 @@
 SYSFILES = zsys_wbw.sys zsys_una.sys
 BINFILES =  zsys_wbw.bin zsys_una.bin
 OBJECTS = $(SYSFILES) $(BINFILES)
-OTHERS = zsdos.rel zsdos.err loader.bin
+OTHERS = zsdos.rel zsdos.err loader.bin zsdos.bin
 TOOLS = ../../Tools
 CCP = ../ZCPR-DJ/zcpr.bin