diff --git a/Source/Apps/Tune/Tune.asm b/Source/Apps/Tune/Tune.asm
index 54429c23..57dc25b9 100644
--- a/Source/Apps/Tune/Tune.asm
+++ b/Source/Apps/Tune/Tune.asm
@@ -747,8 +747,8 @@ FILTYP		.DB	0	; Sound file type (TYPPT2, TYPPT3, TYPMYM)
 TMP		.DB	0	; work around use of undocumented Z80
 ;
 		
-MSGBAN		.DB	"Tune Player for RomWBW v2.2, 21-Nov-2019",0
-MSGUSE		.DB	"Copyright (C) 2019, Wayne Warthen, GNU GPL v3",13,10
+MSGBAN		.DB	"Tune Player for RomWBW v2.2a, 02-Feb-2020",0
+MSGUSE		.DB	"Copyright (C) 2020, Wayne Warthen, GNU GPL v3",13,10
 		.DB	"PTxPlayer Copyright (C) 2004-2007 S.V.Bulba",13,10
 		.DB	"MYMPlay by Marq/Lieves!Tuore",13,10,13,10
 		.DB	"Usage: TUNE <filename>.[PT2|PT3|MYM]",0
@@ -2629,47 +2629,47 @@ HEAP	.EQU	$
 
 VARS
 
-ChanA	.DS CHP
-ChanB	.DS CHP
-ChanC	.DS CHP
+ChanA	.DS	CHP
+ChanB	.DS	CHP
+ChanC	.DS	CHP
 
 ;GlobalVars
-DelyCnt	.DS 1
-CurESld	.DS 2
-CurEDel	.DS 1
+DelyCnt	.DS	1
+CurESld	.DS	2
+CurEDel	.DS	1
 Ns_Base_AddToNs
-Ns_Base	.DS 1
-AddToNs	.DS 1
+Ns_Base	.DS	1
+AddToNs	.DS	1
 
 AYREGS
 
-VT_	.DS 256		;CreatedVolumeTableAddress
+VT_	.DS	256	;CreatedVolumeTableAddress
 
-EnvBase	.EQU VT_+14
+EnvBase	.EQU	VT_+14
 
-T1_	.EQU VT_+16	;Tone tables data depacked here
+T1_	.EQU	VT_+16	;Tone tables data depacked here
 
-T_OLD_1	.EQU T1_
-T_OLD_2	.EQU T_OLD_1+24
-T_OLD_3	.EQU T_OLD_2+24
-T_OLD_0	.EQU T_OLD_3+2
-T_NEW_0	.EQU T_OLD_0
-T_NEW_1	.EQU T_OLD_1
-T_NEW_2	.EQU T_NEW_0+24
-T_NEW_3	.EQU T_OLD_3
+T_OLD_1	.EQU	T1_
+T_OLD_2	.EQU	T_OLD_1+24
+T_OLD_3	.EQU	T_OLD_2+24
+T_OLD_0	.EQU	T_OLD_3+2
+T_NEW_0	.EQU	T_OLD_0
+T_NEW_1	.EQU	T_OLD_1
+T_NEW_2	.EQU	T_NEW_0+24
+T_NEW_3	.EQU	T_OLD_3
 
-PT2EMPTYORN .EQU VT_+31	;1,0,0 sequence
+PT2EMPTYORN	.EQU VT_+31	;1,0,0 sequence
 
-NT_	.FILL 192	;CreatedNoteTableAddress
+NT_	.DS	192	;CreatedNoteTableAddress
 
 ;local var
-Ampl	.EQU AYREGS+AmplC
+Ampl	.EQU	AYREGS+AmplC
 
-VAR0END	.EQU VT_+16 ;INIT zeroes from VARS to VAR0END-1
+VAR0END	.EQU	VT_+16 ;INIT zeroes from VARS to VAR0END-1
 
-VARSEND .EQU $
+VARSEND .EQU	$
 
-MDLADDR .EQU $
+MDLADDR .EQU	$
 ;
 ;===============================================================================
 ; MYM Player Storage
@@ -2678,10 +2678,11 @@ MDLADDR .EQU $
 	.ORG	HEAP
 ; Reserve room for uncompressed data
 uncomp:
-.org $+(3*FRAG*REGS)
+	.DS	(3*FRAG*REGS)
 
 ; The tune is stored here
-rows:   .dw     0
+rows:
+	.DS	2	; WORD value
 data:
 ;
 ;===============================================================================
diff --git a/Source/BPBIOS/Build.cmd b/Source/BPBIOS/Build.cmd
index db50c0d7..fdc9df0f 100644
--- a/Source/BPBIOS/Build.cmd
+++ b/Source/BPBIOS/Build.cmd
@@ -26,22 +26,22 @@ call :makebp 41nbnk
 
 rem pause
 
-cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:ws*.*
+cpmrm.exe -f wbw_hd0 ../../Binary/hd_bp.img 0:ws*.*
 
-cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.img
-cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.img 0:
+cpmrm.exe -f wbw_hd0 ../../Binary/hd_bp.img 0:*.img
+cpmcp.exe -f wbw_hd0 ../../Binary/hd_bp.img *.img 0:
 
-cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.rel
-cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.rel 0:
+cpmrm.exe -f wbw_hd0 ../../Binary/hd_bp.img 0:*.rel
+cpmcp.exe -f wbw_hd0 ../../Binary/hd_bp.img *.rel 0:
 
-rem cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.dat
-rem cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.dat 0:
+rem cpmrm.exe -f wbw_hd0 ../../Binary/hd_bp.img 0:*.dat
+rem cpmcp.exe -f wbw_hd0 ../../Binary/hd_bp.img *.dat 0:
 
-cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.zex
-cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.zex 0:
+cpmrm.exe -f wbw_hd0 ../../Binary/hd_bp.img 0:*.zex
+cpmcp.exe -f wbw_hd0 ../../Binary/hd_bp.img *.zex 0:
 
-cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:myterm.z3t
-cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img myterm.z3t 0:myterm.z3t
+cpmrm.exe -f wbw_hd0 ../../Binary/hd_bp.img 0:myterm.z3t
+cpmcp.exe -f wbw_hd0 ../../Binary/hd_bp.img myterm.z3t 0:myterm.z3t
 
 goto :eof
 
diff --git a/Source/BPBIOS/hardhb.z80 b/Source/BPBIOS/hardhb.z80
index 39d2afab..d19ccb40 100644
--- a/Source/BPBIOS/hardhb.z80
+++ b/Source/BPBIOS/hardhb.z80
@@ -189,7 +189,8 @@ HDSK_RW1:
 	POP	BC              ; RESTORE INCOMING FUNCTION, DEVICE/UNIT
 	RET	NZ              ; ABORT IF SEEK RETURNED AN ERROR W/ ERROR IN A
 	LD	HL,(HB_DSKBUF)  ; GET BUFFER ADDRESS
-	LD	DE,1            ; TRANSFER ONE SECTOR
+	LD	D,BID_HB	; BUFFER IN HBIOS BANK
+	LD	E,1		; ONE SECTOR
 	CALL	HBX_INVOKE	; DO IT
 	OR	A		; SET FLAGS
 	RET	Z		; DONE IF NO ERROR
diff --git a/Source/Images/Build.cmd b/Source/Images/Build.cmd
index 6006c3e6..b1768e31 100644
--- a/Source/Images/Build.cmd
+++ b/Source/Images/Build.cmd
@@ -33,3 +33,4 @@ call BuildHD.cmd nzcom zsys_wbw
 call BuildHD.cmd cpm3
 call BuildHD.cmd zpm3
 call BuildHD.cmd ws4
+call BuildHD.cmd bp