diff --git a/.Floppies/A2OSX.BOOT.woz b/.Floppies/A2OSX.BOOT.woz
index d0d09ecf..01de4c3f 100644
Binary files a/.Floppies/A2OSX.BOOT.woz and b/.Floppies/A2OSX.BOOT.woz differ
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 7dfee22b..c4499738 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.TEST.po b/.Floppies/A2OSX.TEST.po
index f48bf3f3..c579e940 100644
Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ
diff --git a/ProDOS.FX/ProDOS.S.LDR.txt b/ProDOS.FX/ProDOS.S.LDR.txt
index bd496499..8f86c573 100644
--- a/ProDOS.FX/ProDOS.S.LDR.txt
+++ b/ProDOS.FX/ProDOS.S.LDR.txt
@@ -1119,6 +1119,12 @@ LDR.SPStatus.U	.DA #$00				unit number (code for smartport stat)
 LDR.DEVPTRS.CNT	.EQ 14
 
 LDR.DEVPTRS.IDX	.DA #$16				S3D2
+				.DA #$12				S1D2
+				.DA #$02				S1D1
+				.DA #$14				S2D2
+				.DA #$04				S2D1
+				.DA #$18				S4D2
+				.DA #$08				S4D1
 				.DA #$06				S3D1
 				.DA #$1A				S5D2
 				.DA #$0A				S5D1
@@ -1126,12 +1132,6 @@ LDR.DEVPTRS.IDX	.DA #$16				S3D2
 				.DA #$0C				S6D1
 				.DA #$1E				S7D2
 				.DA #$0E				S7D1
-				.DA #$12				S1D2
-				.DA #$02				S1D1
-				.DA #$14				S2D2
-				.DA #$04				S2D1
-				.DA #$18				S4D2
-				.DA #$08				S4D1
 *--------------------------------------
 LDR.cortland 	.DA #0					cortland loader flag (1 = Cortland)
 LDR.BootFlag	.DA #0					0 = normal boot, <>0 = return
diff --git a/ProDOS.FX/ProDOS.S.XDOS.B.txt b/ProDOS.FX/ProDOS.S.XDOS.B.txt
index b7503fcb..b8da27f9 100644
--- a/ProDOS.FX/ProDOS.S.XDOS.B.txt
+++ b/ProDOS.FX/ProDOS.S.XDOS.B.txt
@@ -646,26 +646,26 @@ cmpvcb			lda gbuf+4			 	with name in directory.
 				and #$0F
 				cmp VCBs,x				are they the same length?
 				stx xvcbptr				(see rev note #23)
-				bne L3B1E			  	if not the same.
+				bne .9				  	if not the same.
 
 				tay
 				clc
 				adc xvcbptr
 				tax
 
-L3B18  			lda gbuf+4,y
+.1  			lda gbuf+4,y
 				cmp VCBs,x
-
-L3B1E  			sec		 				anticipate different names.
-				bne L3B26			  	if not the same.
+				bne .9				  	if not the same.
 
 				dex
 				dey
-				bne L3B18
+				bne .1
 
 				clc		 				indicate match.
+				.HS B0					BCS
+.9				sec
 
-L3B26  			ldx xvcbptr				offset to start of vcb (rev note #23)
+				ldx xvcbptr				offset to start of vcb (rev note #23)
 				rts
 *--------------------------------------
 tstdupvol 		lda #VCB0			 	check for other logged in volumes with the same name.
@@ -687,7 +687,7 @@ L3B41  			txa		 				index to next vcb
 				adc #VCB-1
 				bcc L3B2C			  	branch if more to check
 
-L3B49  			clc
+				clc
 				rts
 
 L3B4B  			sta duplflag			duplicate has been found.
diff --git a/ProDOS.FX/ProDOS.S.XRW.txt b/ProDOS.FX/ProDOS.S.XRW.txt
index f1cbb759..e1681663 100644
--- a/ProDOS.FX/ProDOS.S.XRW.txt
+++ b/ProDOS.FX/ProDOS.S.XRW.txt
@@ -165,6 +165,7 @@ XRW.E.ND		lda #MLI.E.NODEV
 				.HS 2C					BIT ABS
 XRW.E.OK		lda #0				
 
+				ldx A2L
 				bit IO.D2.DrvOff,x	 	turn off
 				rts
 *--------------------------------------
@@ -204,8 +205,8 @@ regrwts			ldy #1
 				lda #0
 				sta XRW.D2VolNum-1,y
 
-				jsr XRW.Seek
-				bra .2
+.30				jsr XRW.Seek
+				bra .3
 
 .4  			cmp XRW.ReqTrack
 				beq .5
@@ -222,9 +223,7 @@ regrwts			ldy #1
 				sta XRW.D2SeekTime-1,x
 				
 .41				lda XRW.ReqTrack
-				
-				jsr XRW.Seek
-				bra .2
+				bra .30
 
 .5  			lda XRW.AddrField.S		is this the right sector ?
 				cmp XRW.ReqSector
@@ -737,11 +736,15 @@ L57CD  			pla		 				place last byte into user buffer
 				sta (buf),y
 XRW.Read.RTS	rts
 *--------------------------------------
-XRW.Reset		ldy #4
-				ldx A2L
+XRW.Reset		ldx A2L
 
 				lda IO.D2.ReadMode,x	turn off write enable X = slot $S0
 
+				nop
+				nop
+
+				ldy #4
+
 .1				lda IO.D2.Ph0Off,x
 				inx
 				inx