diff --git a/Binary/Apps/Tunes/Makefile b/Binary/Apps/Tunes/Makefile
index b643ef0f..4b7b57e7 100644
--- a/Binary/Apps/Tunes/Makefile
+++ b/Binary/Apps/Tunes/Makefile
@@ -1,6 +1,6 @@
-TOOLS = ../../../Tools
-
-include $(TOOLS)/Makefile.inc
-
-clean::
-	rm -f *.pt? *.mym
+TOOLS = ../../../Tools
+
+include $(TOOLS)/Makefile.inc
+
+clobber::
+	-rm -f *.pt3 *.mym
diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index f3ad7abc..1e1c2e12 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -11,7 +11,7 @@ TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
 
 BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel 
-BIOSOBJS += move.rel drvtbl.rel diskio.rel
+BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel
 COMMA := ,
 NULL :=
 SPACE := $(NULL) $(NULL)
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index c227ab1a..1e7879d0 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -4,7 +4,17 @@ DEST = ../../Binary/Apps
 TOOLS =../../Tools
 OTHERS =  *.bin *.z80 cpm.sys zsys.sys Build.inc
 include $(TOOLS)/Makefile.inc
+DIFFPATH = $(DIFFTO)/Binary
 
 ZETA2_std.rom:
 	bash Build.sh ZETA2 std 512
+
+hbios_rom.bin:	hbios.asm
+	$(TASM) -dROMBOOT hbios.asm hbios_rom.bin
+
+hbios_app.bin:	hbios.asm
+	$(TASM) -dAPPBOOT hbios.asm hbios_app.bin
+
+hbios_img.bin:	hbios.asm
+	$(TASM) -dIMGBOOT hbios.asm hbios_img.bin
 
diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index 1bffcee4..1118e3d1 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -16,6 +16,8 @@ DEST=../../Binary
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
 
+DIFFPATH = $(DIFFTO)/Binary
+
 hd_combo.img:	$(HDIMGS)
 	cat $(HDIMGS) > $@
 
diff --git a/Source/ZPM3/Makefile b/Source/ZPM3/Makefile
index 9eebbc35..0574dfa0 100644
--- a/Source/ZPM3/Makefile
+++ b/Source/ZPM3/Makefile
@@ -1,6 +1,9 @@
-OBJECTS = zpmldr.com zpmldr.sys cpm3.sys zinstal.zpm startzpm.com zccp.com \
+OBJECTS = zpmldr.com zpmldr.sys cpm3.sys startzpm.com zccp.com \
 	setz3.com clrhist.com autotog.com
-OTHERS = biosldr.rel gencpm.com gencpm.dat bnkbios3.spr
+ifndef REBUILD_ZPM_TOOLS
+NODELETE = setz3.com clrhist.com autotog.com
+endif
+OTHERS = zpmldr.bin loader.bin biosldrd.rel biosldrc.rel gencpm.com gencpm.dat bnkbios3.spr
 TOOLS =../../Tools
 
 include $(TOOLS)/Makefile.inc
@@ -43,8 +46,10 @@ 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/Tools/Makefile.inc b/Tools/Makefile.inc
index beb67b1c..02783e14 100644
--- a/Tools/Makefile.inc
+++ b/Tools/Makefile.inc
@@ -24,7 +24,7 @@ RELPATH := $(subst $(TREEROOT),,$(HERE))
 #
 # where's a copy of this tree for windows so we can diff binaries
 #
-DIFFTO := /Volumes/Github/RomWBW
+DIFFTO := $(shell cd $(TREEROOT)/../RomWBW.windows; pwd)
 DIFFPATH := $(DIFFTO)/$(RELPATH)
 
 #
@@ -144,9 +144,12 @@ diff::
         sf=$$($(CASEFN) $$i) ; \
 		df=$$($(CASEFN) $(DIFFPATH)/$$i) ; \
         if [ -f $$df -a -f $$sf ] ; then \
+			if [ "$(VERBOSEDIFF)" ] ; then \
+				echo compare $$sf and $$df ; \
+			fi ; \
 			if ! cmp -s $$sf $$df ; then \
 				echo $$sf and $$df differ ; \
-				if [ "$(VERBOSEDIFF)" ] ; then \
+				if [ "$(VERBOSEDIFF)" = "2" ] ; then \
 					cmp -bl $$sf $$df ; \
 					hexdump -Cv $$sf > $$sf.dump ; \
 					hexdump -Cv $$df > $$(basename $$df).dump.diff ; \
diff --git a/Tools/unix/casefn.sh b/Tools/unix/casefn.sh
index 2b2939dd..5bade162 100755
--- a/Tools/unix/casefn.sh
+++ b/Tools/unix/casefn.sh
@@ -12,7 +12,7 @@ function cleanup {
 	rm -f $all $search $in
 }
 
-trap cleanup EXIT
+#trap cleanup EXIT
 cleanup
 
 if [ $# -lt 1 ] ; then
@@ -53,10 +53,14 @@ for dn in ${dirs[@]} ; do
 	cd $here
 	cd $dn
 	for i in * ; do
+		# skip any file names containing a space
+		if echo "$i" | grep -sq " " ; then
+			continue
+		fi
 		echo $dn/$(echo "$i" | tr '[A-Z]' '[a-z]')",$dn/$i" >> $in
 	done
 done
-sort $in > $all
+sort -t, -k 1,1 $in > $all
 
 join -t, -o 1.2 $all $search | sort -u > $in
 if [ $(wc -l < $in) -gt 0 ] ; then