diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 526a6bec..13f09823 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index f8131714..d96186ed 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt
index a4df3125..475e536c 100644
--- a/BIN/ARP.S.txt
+++ b/BIN/ARP.S.txt
@@ -201,7 +201,7 @@ CS.DOEVENT		lda (pEvent)
 				rts
 *--------------------------------------
 CS.QUIT			lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt
index 600149d2..89b9b285 100644
--- a/BIN/CHTYP.S.txt
+++ b/BIN/CHTYP.S.txt
@@ -237,7 +237,7 @@ CS.RUN.GetFilePath
 				>SYSCALL GetMemPtr
 				>PUSHYA
 				
-				>PUSHW ZPFullPath
+				>LDYA ZPFullPath
 				
 				>SYSCALL StrCpy
 				
diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt
index 7adcb2a4..40b85a13 100644
--- a/BIN/DNSINFO.S.txt
+++ b/BIN/DNSINFO.S.txt
@@ -141,7 +141,7 @@ CS.EVENT		sec
 				rts
 *--------------------------------------
 CS.QUIT			lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index 392c5d9e..0f92c4a3 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -85,7 +85,7 @@ CS.INIT			ldy #S.PS.ARGC
 				bne .5					Already have a dev name...go get VolName
 							
 				>LDYA ZPPtr1
-				>SYSCALL GetDevByName.YA		
+				>SYSCALL GetDevByName		
 				bcs .99
 				txa
 				>STA.G hDev
@@ -101,7 +101,7 @@ CS.INIT			ldy #S.PS.ARGC
 				beq .99					VolName too long
 
 .61				>PUSHW ZPPtr1
-				>PUSHEA.G VolName
+				>LEA.G VolName
 				>SYSCALL StrCpy
 				jmp .1					success, scan for any other args
 
@@ -200,32 +200,25 @@ CS.RUN.InitCat	>LDA.G CatSize
 .8				clc
 				rts
 *--------------------------------------
-CS.RUN.BuildCat	>LDA.G hDev
+CS.RUN.BuildCat	>PUSHEA.G DIB
+				>LDA.G hDev
 				>SYSCALL GetDevStatus
 				bcs .99
 				
-				>STYA ZPPtr1
-				ldy #S.DIB.SIZE
-				lda (ZPPtr1),y
-				>STA.G SizeInBlocks
-				ldy #S.DIB.SIZE+1
-				lda (ZPPtr1),y
-				>STA.G SizeInBlocks+1
-				
 				>LDA.G hDev
 				>SYSCALL GetDevByID
 				bcs .99
 				
 				pha
 				tya
-				adc #S.DEV.NAME
+				adc #S.FD.DEV.NAME
 				sta ZPPtr2
 				pla
-				adc /S.DEV.NAME
+				adc /S.FD.DEV.NAME
 				sta ZPPtr2+1
 								
 				>PUSHEA.G VolName
-				>PUSHW.G SizeInBlocks
+				>PUSHW.G DIB+S.DIB.SIZE
 				>PUSHW ZPPtr2
 				
 				>LDYA L.MSG.INIT
@@ -248,38 +241,38 @@ CS.RUN.BuildCat	>LDA.G hDev
 				bcs .9
 				
 				phx
-				>STYA.G BlkParams.Ptr			
+				>STYA.G IOCTL+S.IOCTL.BUFPTR
 				pla
 				>STA.G hBuf
 				
 				jsr .7
 				
 				>PUSHEA.G VolName
-				>PUSHW.G BlkParams.Ptr
+				>PUSHW.G IOCTL+S.IOCTL.BUFPTR
 				>LIBCALL hLIBBLKDEV,LIBBLKDEV.BuildProDOSCat
 .9				rts
 
-.7				>PUSHW.G SizeInBlocks
+.7				>PUSHW.G DIB+S.DIB.SIZE
 				>PUSHB.G CatSize
 				>PUSHB.G CatOptions
 				rts
 *--------------------------------------
-CS.RUN.WriteCat	>PUSHB.G hDev
-				>PUSHBI DEVMGR.WRITEBLOCK		
-				>PUSHEA.G BlkParams.Ptr
-				
+CS.RUN.WriteCat	>PUSHEA.G IOCTL
+				>PUSHBI IOCTL.WRITEBLOCK		
+				>LDA.G hDev
+
 				>SYSCALL IOCTL
 				bcs .9
 				
 				lda #'.'
 				>SYSCALL PutChar
 				
-				>LDA.G BlkParams.Ptr+1
-				clc				
-				adc #2
+				>LDA.G IOCTL+S.IOCTL.BUFPTR+1
+				inc
+				inc
 				sta (pData),y
 				
-				>INC.G BlkParams.Num
+				>INC.G IOCTL+S.IOCTL.BLKNUM
 				
 				>SLEEP
 				
@@ -297,7 +290,7 @@ CS.QUIT			>LDA.G hBuf
 .1				lda hLIBBLKDEV
 				beq .8
 				
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				
 .8				clc
 				rts
@@ -343,13 +336,12 @@ ArgIndex		.BS 1
 bLL				.BS 1
 VolName			.BS 16
 hDev			.BS 5
-SizeInBlocks	.BS 2
 CatSize			.BS 1
 CatOptions		.BS 1
 BlkCnt			.BS 1
-BlkParams.Ptr	.BS 2
-BlkParams.Num	.BS 2
+IOCTL			.BS S.IOCTL
 hBuf			.BS 1
+DIB				.BS S.DIB
 DS.END			.ED
 *--------------------------------------
 MAN
diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt
index 003f68cf..e954d7de 100644
--- a/BIN/IPCONFIG.S.txt
+++ b/BIN/IPCONFIG.S.txt
@@ -248,7 +248,7 @@ CS.DOEVENT		sec
 *--------------------------------------
 CS.QUIT			lda hLIBTCPIP
 				beq .8
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				
 .8				clc
 				rts
diff --git a/BIN/MD5.S.txt b/BIN/MD5.S.txt
index 3590d6f7..491b6afe 100644
--- a/BIN/MD5.S.txt
+++ b/BIN/MD5.S.txt
@@ -210,7 +210,7 @@ CS.QUIT			>LDA.G hFullPath
 .7				lda hLIBCRYPT
 				beq .8
 				
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				
 .8				clc
 				rts
diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt
index abe08a33..5e4f4db8 100644
--- a/BIN/NETSTAT.S.txt
+++ b/BIN/NETSTAT.S.txt
@@ -122,7 +122,7 @@ CS.DOEVENT		sec
 *--------------------------------------
 CS.QUIT			lda hLIBTCPIP
 				beq .8
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				
 .8				clc
 				rts
diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index a0f24666..f9ef5ff1 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -303,7 +303,7 @@ CS.QUIT			ldy #hFrame
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA
 				
 				lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt
index 74717367..8a4513d3 100644
--- a/BIN/RPCDUMP.S.txt
+++ b/BIN/RPCDUMP.S.txt
@@ -180,7 +180,7 @@ CS.QUIT			ldy #hSocket
 				
 .1				lda hLIBTCPIP
 				beq .8
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				
 .8				clc
 				rts
diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt
index a08fa463..0386c175 100644
--- a/INC/A2osX.I.txt
+++ b/INC/A2osX.I.txt
@@ -325,7 +325,7 @@ S.IOCTL.BLKNUM		.EQ 4				3 BYTES
 S.IOCTL.BYTECNT		.EQ 4				2 BYTES
 S.IOCTL.ADDRPTR		.EQ 6				3 BYTES
 *
-S.IOCTRL			.EQ 9
+S.IOCTL				.EQ 9
 *--------------------------------------
 S.DIB.S			.EQ 0
 S.DIB.S.BLOCK		.EQ %10000000
diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt
index 4814cf4c..e1cac5db 100644
--- a/LIB/LIBBLKDEV.S.txt
+++ b/LIB/LIBBLKDEV.S.txt
@@ -4,12 +4,12 @@ AUTO 4,1
 				.LIST OFF	
 				.OP	65C02
 				.OR	$2000
-				.TF /A2OSX.BUILD/LIB/LIBBLKDEV.O
+				.TF LIB/LIBBLKDEV.O
 *--------------------------------------
-				.INB /A2OSX.BUILD/INC/MACROS.I
-				.INB /A2OSX.BUILD/INC/A2OSX.I
-				.INB /A2OSX.BUILD/INC/PRODOS.I
-				.INB /A2OSX.BUILD/INC/LIBBLKDEV.I
+				.INB INC/MACROS.I
+				.INB INC/A2OSX.I
+				.INB INC/PRODOS.I
+				.INB INC/LIBBLKDEV.I
 *--------------------------------------
 * NIBBLE track len = $1A00 (6656) bytes:
 * 
@@ -79,6 +79,9 @@ LIB.UNLOAD		clc
 */--------------------------------------
 * # GetProDOSCatSize
 *  Compute space needed for ProDOS Catalog
+* ## C
+* int getprodoscatsize (short int options, short int catsize, int devsize );  
+* ## ASM
 * **In:**
 *  PUSHW = DevSize (in 512b blocks)
 *  PUSHB = Catalog Size (in blocks)
diff --git a/README.md b/README.md
index 3192e22d..45237b66 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,22 @@
 
 + **A2OSX.BOOT.po**   :  **(0.9.1)**  140k BOOT disk image with all binaries  
 + **A2OSX.DEV.po**    :  **(0.9.1)**  140k disk image with ASM binaries, Debug Tools & INClude files  
-+ **A2OSX.BUILD.po**  :  **(0.9.2)**  800k BOOT disk image with S-C MASM 3.0 and all binaries (BOOT+DEV)  
-+ **A2OSX.SRC.po**    :  **(0.9.2)**  800k disk image with all sources  
++ **A2OSX.BUILD.po**  :  **(0.92)**  800k BOOT disk image with S-C MASM 3.0 and all binaries (BOOT+DEV)  
++ **A2OSX.SRC.po**    :  **(0.92)**  800k disk image with all sources  
 
-## Latest News 2018-06-17
+## Latest News 2018-07-20
+
+Kernel & some BINs/SBINs migrated to 0.92.
+A2OSX.BOOT.po 0.92 coming soon ... 
+
+## News 2018-06-17
 
 Ok, as i'm still the lone developer here, i decided to break the kernel, HAHAHAHAHAHA!!!!
 I updated the Calling Convention (see projects), i now setup the header in each KERNEL.S.* file accordingly to generate doc, then i change the code...
 
 So ....nothing works anymore on the A2OSX.BUILD media...
 
-## Latest News 2018-06-13
+## News 2018-06-13
 
 Previous (relatively!) stable version 0.9.1 has been archived, see link above.  
 
@@ -54,7 +59,7 @@ I need :
  + someone able to build a test plan
  + ....ideas...help....support....beer, or something stronger! 
 
-## Latest News 2018-05-29
+## News 2018-05-29
 
 Time to work on STDIO : 
 
@@ -322,7 +327,9 @@ note : '$VAR' does NOT expand Variable
 | | | -N : Number all output lines | |
 | | | -S : Suppress repeated empty output lines | |
 | EDIT | Working | still missing : find/replace | 0.92 |
-| CHTYP | Working | -C : Continue On Error | 0.9.1 |
+| FORMAT | In Progress | -L : Low-Level Format | 0.92 |
+| | | -1..9 : Catalog Size (block count) | |
+| CHTYP | Working | -C : Continue On Error | 0.92 |
 | | | -R : Recurse subdirectories | |
 | CHMOD | In Progress | -C : Continue On Error | 0.9 |
 | | | -R : Recurse subdirectories | |
@@ -330,8 +337,6 @@ note : '$VAR' does NOT expand Variable
 | | | -R : Recurse subdirectories | |
 | CHGRP | In Progress | -C : Continue On Error | 0.9 |
 | | | -R : Recurse subdirectories | |
-| FORMAT | In Progress | -L : Low-Level Format | 0.9.1 |
-| | | -1..9 : Catalog Size (block count) | |
 | MD5 | In Progress | -D : String Input | 0.9.1 |
 | NSCUTIL | Working | Tool for setting time in NSC/DL1216E | 0.9 |
 
diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt
index 9c06bb22..13cf1ea0 100644
--- a/SBIN/DHCPCLNT.S.txt
+++ b/SBIN/DHCPCLNT.S.txt
@@ -244,7 +244,7 @@ CS.QUIT			ldy #hSocket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CloseA
 				
 .1				lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt
index 2d388dad..5a166477 100644
--- a/SBIN/HTTPD.S.txt
+++ b/SBIN/HTTPD.S.txt
@@ -239,7 +239,7 @@ CS.QUIT			ldx #CONN.MAX
 				>SYSCALL FreeMem
 				
 .3				lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt
index 86ff779a..2c776580 100644
--- a/SBIN/TCPIPD.S.txt
+++ b/SBIN/TCPIPD.S.txt
@@ -156,7 +156,7 @@ CS.QUIT			>LDA.G hDev
 				>SYSCALL IOCTL
 				
 .1				lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt
index 30bea365..cf05ea48 100644
--- a/SBIN/TELNETD.S.txt
+++ b/SBIN/TELNETD.S.txt
@@ -250,7 +250,7 @@ CS.QUIT			ldx #CONN.MAX
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA
 				
 .3				lda hLIBTCPIP
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------
diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt
index 5182c3da..136a2649 100644
--- a/SYS/KERNEL.S.txt
+++ b/SYS/KERNEL.S.txt
@@ -53,6 +53,7 @@ A2osX.E0		.PH $E000
 				.INB /A2OSX.SRC/SYS/KERNEL.S.IRQ
 				.INB /A2OSX.SRC/SYS/KERNEL.S.MEM
 				.INB /A2OSX.SRC/SYS/KERNEL.S.IO
+********* TMP ***** go to A2osX.D1 				
 				.INB /A2OSX.SRC/SYS/KERNEL.S.FIO
 DevMgr.FreeMem	.EQ *
 				.EP
diff --git a/TEST.S.txt b/TEST.S.txt
index 725f2107..73635f2c 100644
--- a/TEST.S.txt
+++ b/TEST.S.txt
@@ -398,7 +398,7 @@ CS.QUIT			>LDA.G PAK.hFileName
 				>SYSCALL FreeMem
 				
 .8				lda hLIBPAK
-				>SYSCALL UnloadLib.A
+				>SYSCALL UnloadLib
 				clc
 				rts
 *--------------------------------------