diff --git a/.Floppies/A2OSX.BOOTHD.woz b/.Floppies/A2OSX.BOOTHD.woz
index 3c6678de..007788c8 100644
Binary files a/.Floppies/A2OSX.BOOTHD.woz and b/.Floppies/A2OSX.BOOTHD.woz differ
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 7aa9651c..f4859d46 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 f61a8e6b..90d35782 100644
Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ
diff --git a/BIN/ATBROWSE.S.txt b/BIN/ATBROWSE.S.txt
index 9360acb7..da375a24 100644
--- a/BIN/ATBROWSE.S.txt
+++ b/BIN/ATBROWSE.S.txt
@@ -233,8 +233,8 @@ MSG.MYZONE		.AZ "Zone Name   :%S\r\n"
 SEARCH.STRING	>PSTR "="
 				>PSTR "="
 				>PSTR "*"
-MSG.DUMP0		.AZ "\e[?7lNet  Nod SkT En# Object:Type@Zone"
-MSG.DUMP		.AZ "%H %h  %h  %h  %S:%S@%S\r\n"
+MSG.DUMP0		.AZ "Net  Nod SkT En# Object:Type@Zone"
+MSG.DUMP		.AZ "\e[?7l%H %h  %h  %h  %S:%S@%S\r\n"
 *--------------------------------------
 				.DUMMY
 				.OR 0
diff --git a/BIN/HTTPGET.S.txt b/BIN/HTTPGET.S.txt
index 252959ff..248eb6bb 100644
--- a/BIN/HTTPGET.S.txt
+++ b/BIN/HTTPGET.S.txt
@@ -277,7 +277,24 @@ CS.RUN.OPENSKT	>PUSHBI 0				no protocol
 				lda #ERR.SKT.NOCONN
 				bra .9
 
-.3				>LDYA L.MSG.CONNECTED
+.3				>SLEEP
+
+				lda hSocket
+				>LIBCALL hLIBTCPIP,LIBTCPIP.Recv
+				bcc .7
+
+				cmp #E.NODATA
+				beq .8
+
+				ldx TimeOut
+				bne .3
+				
+				lda #ERR.SKT.NOCONN
+				bra .9
+				
+.7				>SYSCALL Freemem				
+				
+.8				>LDYA L.MSG.CONNECTED
 				>SYSCALL PutS
 
 				>SLEEP
diff --git a/LIB/LIBBLKDEV.S.BB.txt b/LIB/LIBBLKDEV.S.BB.txt
index a1e8a11d..691f00f7 100644
--- a/LIB/LIBBLKDEV.S.BB.txt
+++ b/LIB/LIBBLKDEV.S.BB.txt
@@ -305,7 +305,8 @@ BB.Seek			lda BB.HdrTrk			get track we're on
 				ldx BB.Slotn0			will do a ph0 off
 				ldy BB.Slotn0
 
-.1				jsr BB.PhasesOff
+.1				sta IO.D2.Ph0Off,x
+				sta IO.D2.Ph0Off,y
 
 				bcs .2
 
@@ -354,8 +355,8 @@ BB.Seek			lda BB.HdrTrk			get track we're on
 				
 .4				tay
 
-				lda IO.D2.Ph0On,x
-				lda IO.D2.Ph0On,y
+				sta IO.D2.Ph0On,x
+				sta IO.D2.Ph0On,y
 				
 				lda #IO.D2.SeekTimeB
 				jsr BB.Wait
@@ -368,16 +369,13 @@ BB.Seek			lda BB.HdrTrk			get track we're on
 				lda #0
 				jsr BB.Wait
 
-				jsr BB.PhasesOff
+				sta IO.D2.Ph0Off,x
+				sta IO.D2.Ph0Off,y
 				bra BB.Read
 *--------------------------------------
-BB.PhasesOff	bit IO.D2.Ph0Off,x
-				ldx IO.D2.Ph0Off,y
-				rts
-*--------------------------------------
 BB.Wait			phx						(3)
 
-.1				ldx #19					(2)
+.1				ldx #20					(2)
 
 .2 				dex 					(2)
 				bne .2					(3)
diff --git a/LIB/LIBBLKDEV.S.D2.txt b/LIB/LIBBLKDEV.S.D2.txt
index 9e9775ea..b15d7fec 100644
--- a/LIB/LIBBLKDEV.S.D2.txt
+++ b/LIB/LIBBLKDEV.S.D2.txt
@@ -84,6 +84,8 @@ D2MoveHead.SEI	ldx Slotn0
 				beq	.8
 
 				sta IO.D2.Ph0Off,x
+				nop
+				nop
 				sta IO.D2.Ph0Off,y
 				
 				bcs	.2
@@ -134,6 +136,8 @@ D2MoveHead.SEI	ldx Slotn0
 .4				tay
 				
 				sta IO.D2.Ph0On,x
+				nop
+				nop
 				sta IO.D2.Ph0On,y
 				
 				lda #IO.D2.SeekTimeF
@@ -144,6 +148,8 @@ D2MoveHead.SEI	ldx Slotn0
 .8				jsr D2.Wait25600usec
 				
 				sta IO.D2.Ph0Off,x
+				nop
+				nop
 				sta IO.D2.Ph0Off,y
 				rts
 *--------------------------------------
diff --git a/LIB/LIBCIFS.S.txt b/LIB/LIBCIFS.S.txt
index 69b6ffd2..5328cbf7 100644
--- a/LIB/LIBCIFS.S.txt
+++ b/LIB/LIBCIFS.S.txt
@@ -76,7 +76,9 @@ LIB.LOAD		>LDYA L.LIBTCPIP
 				bcs .9
 
 				sta hLIBTCPIP
-
+				>SYSCALL GetMemPtr
+				>STYA aLIBTCPIP
+				
 				>LDYAI 256
 				>SYSCALL GetMem
 				bcs .9
@@ -117,9 +119,11 @@ CIFS.Negotiate	lda (pStack)
 				ldy #1+4				hSocket
 				lda (pStack),y
 
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Send
+				ldx #LIBTCPIP.Send
+				jsr GO.LIBTCPIP
+
 				bcs .99
-			>DEBUG
+
 				lda #0
 				sec
 				rts
@@ -130,8 +134,10 @@ CIFS.Negotiate	lda (pStack)
 
 				ldy #1					hSocket
 				lda (pStack),y
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Recv
-			>DEBUG
+
+				ldx #LIBTCPIP.Recv
+				jsr GO.LIBTCPIP
+
 				bcc .3
 
 				cmp #E.NODATA
@@ -258,7 +264,8 @@ CIFS.SessionSetup
 				ldy #6+4				hSocket
 				lda (pStack),y
 
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Send
+				ldx #LIBTCPIP.Send
+				jsr GO.LIBTCPIP
 				bcs .99
 
 				lda #0
@@ -271,7 +278,8 @@ CIFS.SessionSetup
 
 				ldy #6					hSocket
 				lda (pStack),y
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Recv
+				ldx #LIBTCPIP.Recv
+				jsr GO.LIBTCPIP
 				bcc .6
 
 				cmp #E.NODATA
@@ -305,7 +313,7 @@ CIFS.SessionSetup
 				>SYSCALL FreeMem
 
 .98				lda #MLI.E.IO
-
+				sec
 .99				>POP 7
 				rts				
 *--------------------------------------
@@ -395,7 +403,8 @@ CIFS.TreeConnect
 				ldy #4+4				hSocket
 				lda (pStack),y
 
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Send
+				ldx #LIBTCPIP.Send
+				jsr GO.LIBTCPIP
 				bcs .99
 
 				lda #0
@@ -408,7 +417,7 @@ CIFS.TreeConnect
 
 				ldy #4					hSocket
 				lda (pStack),y
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Recv
+				ldx #LIBTCPIP.Recv
 				bcc .6
 
 				cmp #E.NODATA
@@ -442,7 +451,7 @@ CIFS.TreeConnect
 				>SYSCALL FreeMem
 
 .98				lda #MLI.E.IO
-
+				sec
 .99				>POP 5
 				rts				
 *--------------------------------------
@@ -557,10 +566,13 @@ GetRespData		sta hResp
 				sta	ZPRespPtr+1
 				rts
 *--------------------------------------
+GO.LIBTCPIP		jmp (aLIBTCPIP)
+*--------------------------------------
 CS.END
 *--------------------------------------
 LIBTCPIP		.AZ "libtcpip"
 hLIBTCPIP		.BS 1
+aLIBTCPIP		.BS 2
 *--------------------------------------
 SMB.TRANSPORT	.DA #0					DIRECT TCP TRANSPORT
 				.DA #0					24 BITS LENGTH
diff --git a/LIB/LIBPAK.S.txt b/LIB/LIBPAK.S.txt
index 95bda872..29779f54 100644
--- a/LIB/LIBPAK.S.txt
+++ b/LIB/LIBPAK.S.txt
@@ -580,7 +580,11 @@ Pak.Out.PutYBits
 
 *				clc
 
-.9				rts
+				rts
+				
+.9				lda #E.BUF
+				sec
+				rts				
 *--------------------------------------
 Pak.Out.PutByte	inc Pak.DstCnt
 				bne .1
@@ -604,7 +608,8 @@ Pak.Out.PutByte	inc Pak.DstCnt
 .8				clc
 				rts
 
-.9				sec
+.9				lda #E.BUF
+				sec
 				rts
 *--------------------------------------
 Pak.UpdateStats	inc Pak.Stat,x
diff --git a/ProDOS.FX/ProDOS.S.XRW.txt b/ProDOS.FX/ProDOS.S.XRW.txt
index f39a7150..45c80f4f 100644
--- a/ProDOS.FX/ProDOS.S.XRW.txt
+++ b/ProDOS.FX/ProDOS.S.XRW.txt
@@ -387,7 +387,7 @@ XRW.SectorIO	lda #2
 XRW.Write		lda IO.D2.ReadProt,x	PREWRITE MODE
 				.LIST OFF
 				
-*				lda IO.D2.ReadMode,x
+				lda IO.D2.ReadMode,x
 				
 				lda nbuf2
 				sta pcl
@@ -521,7 +521,7 @@ wrefd5			ldx #$60   				(2) restore slot. warning: modified by prenib
 
 				clc	  					(2)
 
-				jsr XRW.Write.RTS		(6+6)
+*				jsr XRW.Write.RTS		(6+6)
 
 *				lda #$FF				(2)
 *				nop						(2)
@@ -730,8 +730,11 @@ XRW.Seek		ldx XRW.UnitIndex
 				beq	.8
 
 				sta IO.D2.Ph0Off,x
+				nop
+				nop
 				sta IO.D2.Ph0Off,y
-				
+				nop
+				nop
 				bcs	.2
 
 * Current < Target, must move in
@@ -780,8 +783,11 @@ XRW.Seek		ldx XRW.UnitIndex
 .4				tay
 				
 				sta IO.D2.Ph0On,x
+				nop
+				nop
 				sta IO.D2.Ph0On,y
-				
+				nop
+				nop
 				jsr XRW.WaitSeekTime
 				
 				bra .1
@@ -789,7 +795,11 @@ XRW.Seek		ldx XRW.UnitIndex
 .8				jsr XRW.Wait25600usec
 
 				sta IO.D2.Ph0Off,x
+				nop
+				nop
 				sta IO.D2.Ph0Off,y
+				nop
+				nop
 				rts
 *--------------------------------------
 XRW.WaitSeekTime
diff --git a/SBIN/CIFSD.S.txt b/SBIN/CIFSD.S.txt
index 17bfeb3d..0a519126 100644
--- a/SBIN/CIFSD.S.txt
+++ b/SBIN/CIFSD.S.txt
@@ -105,20 +105,16 @@ CS.RUN			lda hSocket
 				>PUSHB hSocket
 				>PUSHBI 0
 				>LIBCALL hLIBCIFS,LIBCIFS.Negotiate
-
-*				jsr CS.RUN.Negotiate
 				bcs .9
 
 				sta hSMBContext
-
+			>DEBUG
 				>PUSHB hSocket
 				>PUSHB hSMBContext
 				>PUSHWI 0
 				>PUSHWI 0
 				>PUSHBI 0
 				>LIBCALL hLIBCIFS,LIBCIFS.SessionSetup
-
-*				jsr CS.RUN.SessSetup
 				bcs .9
 
 				>PUSHB hSocket
@@ -128,8 +124,6 @@ CS.RUN			lda hSocket
 				>PUSHYA
 				>PUSHBI 0
 				>LIBCALL hLIBCIFS,LIBCIFS.TreeConnect
-
-*				jsr CS.RUN.TreeConn
 				bcs .9
 
 *				lda #3