diff --git a/.Docs/Command Guide.md b/.Docs/Command Guide.md
index 06c5d715..fc050c14 100644
--- a/.Docs/Command Guide.md
+++ b/.Docs/Command Guide.md
@@ -243,17 +243,17 @@ As part of the 0.94 release, ProDOS FX has been enhanced with a completely new 5
|Drive | Base|Switches|Extended| Format
Test |Read/Write
Test|Boot
Test|
|-|-|-|-|-|-|-|
-|Disk ][ | 140K| -H |188K| - |-|-|
-|AM104| 140K|-H|188K| - |-|-|
-|AM107| 140K|-H|188K| - |-|-|
-|DuoDisk |140K|-H|188K| - |-|-|
-|FD-100| 140K|-H
-X
-H -X |188K
160K
216K| - |-|-|
-|Disk //c internal | 140K| -H |188K| - |-|-|
-|Disk //c external | 140K| -H |188K| - |-|-|
-|Rana I | 140K| -H |188K| - |-|-|
-|Rana II| 140K|-H
-X
-H -X |188K
160K
216K| - |-|-|
-|Rana III| 140K|-H
-X
-H -X |188K
160K
216K| - |-|-|
-|AE 5.25| 140K|-H
-X
-H -X |188K
160K
216K| - |-|-|
+|Disk ][ | 140K| -H |192K| - |-|-|
+|AM104| 140K|-H|192K| - |-|-|
+|AM107| 140K|-H|192K| - |-|-|
+|DuoDisk |140K|-H|192K| - |-|-|
+|FD-100| 140K|-H
-X
-H -X |192K
160K
216K| - |-|-|
+|Disk //c internal | 140K| -H |192K| - |-|-|
+|Disk //c external | 140K| -H |192K| - |-|-|
+|Rana I | 140K| -H |192K| - |-|-|
+|Rana II| 140K|-H
-X
-H -X |192K
160K
216K| - |-|-|
+|Rana III| 140K|-H
-X
-H -X |192K
160K
216K| - |-|-|
+|AE 5.25| 140K|-H
-X
-H -X |192K
160K
216K| - |-|-|
### GREP
diff --git a/.Docs/LIBTCPIP.md b/.Docs/LIBTCPIP.md
index e817f6be..6744dcfd 100644
--- a/.Docs/LIBTCPIP.md
+++ b/.Docs/LIBTCPIP.md
@@ -130,11 +130,11 @@ Accept a connection on a socket
`hFD Accept(hFD fd);`
## ASM
-**In:**
+**In:**
`lda fd`
`>LIBCALL hLIBTCPIP,LIBTCPIP.accept`
-## RETURN VALUE
+## RETURN VALUE
A = hSocket
# Shutdown
diff --git a/.Floppies/A2OSX.BLANK.woz b/.Floppies/A2OSX.BLANK.woz
index 930da88a..60d0724a 100644
Binary files a/.Floppies/A2OSX.BLANK.woz and b/.Floppies/A2OSX.BLANK.woz differ
diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po
index e1107463..f3be3ac1 100644
Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ
diff --git a/.Floppies/A2OSX.BOOTHD.woz b/.Floppies/A2OSX.BOOTHD.woz
index 26ddd8a8..3bdbaf52 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 107b1a49..c994a37d 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 f510f0d9..d27393cd 100644
Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ
diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index 9bef6c03..0374dc31 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -198,10 +198,10 @@ CS.RUN.Format jsr CS.RUN.GetDevStatus
>LDYA L.MSG.OK
>SYSCALL PutS
- bit bVerify
- bpl .8
+* bit bVerify
+* bpl .8
- jsr CS.RUN.LL.DISKII.V
+* jsr CS.RUN.LL.DISKII.V
bcs .9
.8 >PUSHB DSSS0000
@@ -702,7 +702,7 @@ hLIBBLKDEV .BS 1
*--------------------------------------
MSG.USAGE1 .AS "Usage : FORMAT [VOL.NAME]\r\n"
.AS " -L : Low-Level Format\r\n"
- .AZ " -H : 35trk drives, High Density: 47 tracks, 376 Blocks\r\n"
+ .AZ " -H : 35trk drives, High Density: 48 tracks, 384 Blocks\r\n"
MSG.USAGE2 .AS " -X : 40trk drives, 320 Blocks, combined with -H, 432 Blocks\r\n"
.AS " -V : Verify\r\n"
.AS " -B xxxx : Smrtprt, Override Device block size\r\n"
diff --git a/INC/IO.D2.I.txt b/INC/IO.D2.I.txt
index c507a2c3..5732e858 100644
--- a/INC/IO.D2.I.txt
+++ b/INC/IO.D2.I.txt
@@ -2,7 +2,7 @@ NEW
AUTO 3,1
*--------------------------------------
IO.D2.SeekTimeR .EQ 160 LIBBLKDEV Recalibration
-IO.D2.SeekTimeF .EQ 125 LIBBLKDEV Track Formatter
+IO.D2.SeekTimeF .EQ 85 LIBBLKDEV Track Formatter
IO.D2.SeekTimeB .EQ 85 LIBBLKDEV Boot Block
IO.D2.SeekTimeP .EQ 60 ProDOS.FX initial
IO.D2.SeekTimeI .EQ 20 ProDOS.FX increment -> until > 128
diff --git a/LIB/LIBBLKDEV.S.BB.txt b/LIB/LIBBLKDEV.S.BB.txt
index 9795a400..2a0e4b14 100644
--- a/LIB/LIBBLKDEV.S.BB.txt
+++ b/LIB/LIBBLKDEV.S.BB.txt
@@ -154,7 +154,6 @@ rddir jsr goread call read block routine.
bcc rddir loop if not.
*--------------------------------------
lda #4 begin look-up with first entry past header.
-* bne nxdent1 branch always
.HS 2C BIT ABS
nxdent lda idxl
@@ -206,7 +205,7 @@ lookpro lda (idxl),y look for matching name.
sty iobuff+1
iny
sty idxh+1
-
+*--------------------------------------
rdkernl jsr goread read index block.
bterr2 bcs booterr
@@ -224,8 +223,7 @@ bterr2 bcs booterr
jmp kernel go execute kernel code.
*--------------------------------------
-booterr
- jsr clrscrn clear video
+booterr jsr clrscrn clear video
ldy #BB.MSG.ERR.Len-1
.1 lda BB.MSG.ERR,y
@@ -327,7 +325,7 @@ BB.Seek lda BB.HdrTrk get track we're on
and #6
ora BB.Slotn0
- tay
+ tax
pla
@@ -344,7 +342,7 @@ BB.Seek lda BB.HdrTrk get track we're on
.3 dec
and #6
- ora Slotn0
+ ora BB.Slotn0
bcc .4
* move out : invert 2 phases
@@ -368,6 +366,7 @@ BB.Seek lda BB.HdrTrk get track we're on
lda BB.CurrentQTrack
cmp BB.TargetQTrack
+
bne .1
lda #0
diff --git a/LIB/LIBBLKDEV.S.D2.txt b/LIB/LIBBLKDEV.S.D2.txt
index f62599ab..2be19251 100644
--- a/LIB/LIBBLKDEV.S.D2.txt
+++ b/LIB/LIBBLKDEV.S.D2.txt
@@ -120,11 +120,11 @@ D2MoveHead >PULLB MoveTo
.4 tay
- lda IO.D2.Ph0On,y
+ lda IO.D2.Ph0On,x
nop
nop
- lda IO.D2.Ph0On,x
+ lda IO.D2.Ph0On,y
nop
nop
@@ -140,6 +140,7 @@ D2MoveHead >PULLB MoveTo
.8 bit IO.D2.Ph0Off,x
nop
nop
+
ldx IO.D2.Ph0Off,y
nop
nop
@@ -470,6 +471,11 @@ PutBytePtr2 sta (ZPPtr2)
.8 rts
*--------------------------------------
D2WriteTrackPtr2
+ lda hTrkBuf
+ >SYSCALL2 GetMemPtr
+ >STYA ZPPtr1
+
+ php
sei
ldy #TrkWriter.Size
@@ -479,14 +485,11 @@ D2WriteTrackPtr2
dey
bne .1
- lda hTrkBuf
- >SYSCALL2 GetMemPtr
- >STYA ZPPtr1
ldx Slotn0
jsr $200
- cli
+ plp
rts
*--------------------------------------
MAN
diff --git a/ProDOS.FX/ProDOS.S.XRW.txt b/ProDOS.FX/ProDOS.S.XRW.txt
index 57e58451..959eb95f 100644
--- a/ProDOS.FX/ProDOS.S.XRW.txt
+++ b/ProDOS.FX/ProDOS.S.XRW.txt
@@ -837,11 +837,11 @@ XRW.Seek ldx XRW.UnitIndex
.4 tay
- lda IO.D2.Ph0On,y
+ lda IO.D2.Ph0On,x
nop
nop
- lda IO.D2.Ph0On,x
+ lda IO.D2.Ph0On,y
nop
nop