diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 695d54ca..d28c3d82 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index ae45e360..07838937 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -16,6 +16,8 @@ AUTO 4,1
 ZS.START
 ZPPtr1			.BS 2
 ZPPtr2			.BS 2
+ZPPtrFD			.BS 2
+ZPPtrDevName	.BS 2
 ZS.END
 				.ED
 *--------------------------------------
@@ -94,11 +96,12 @@ CS.INIT			ldy #S.PS.ARGC
 				>LDYA ZPPtr1
 				>SYSCALL GetDevByName
 				bcs .99
+				>STYA ZPPtrFD
 				txa
 				>STA.G hDevID
-				lda Dev.Table.hFD,x
-				>STA.G hDevFD
 				
+				>LDYA ZPPtr1
+				>STYA ZPPtrDevName
 				bra .1
 				
 .5				ldy #$ff
@@ -210,7 +213,7 @@ CS.RUN.InitCat	>LDA.G CatSize
 				rts
 *--------------------------------------
 CS.RUN.BuildCat	>PUSHEA.G DIB
-				>LDA.G hDevFD
+				>LDA.G hDevID
 
 				>SYSCALL GetDevStatus
 				bcs .99
@@ -218,11 +221,7 @@ CS.RUN.BuildCat	>PUSHEA.G DIB
 				>PUSHEA.G VolName
 				>PUSHW.G DIB+S.DIB.SIZE
 				
-				>LDA.G hDevID
-				tax
-				lda Dev.Table.hPath,x
-				>SYSCALL GetMemPtr
-				>PUSHYA
+				>PUSHW ZPPtrDevName
 
 				>PUSHBI 6
 				>LDYA L.MSG.INIT
@@ -263,7 +262,7 @@ CS.RUN.BuildCat	>PUSHEA.G DIB
 *--------------------------------------
 CS.RUN.WriteCat	>PUSHEA.G IOCTL
 				>PUSHBI IOCTL.WRITEBLOCK		
-				>LDA.G hDevFD
+				>LDA.G hDevID
 
 				>SYSCALL IOCTL
 				bcs .9
@@ -340,7 +339,6 @@ ArgIndex		.BS 1
 bLL				.BS 1
 VolName			.BS 16
 hDevID			.BS 1
-hDevFD			.BS 1
 CatSize			.BS 1
 CatOptions		.BS 1
 BlkCnt			.BS 1
diff --git a/BIN/SH.S.CORE.txt b/BIN/SH.S.CORE.txt
index 08b3aebc..ba981590 100644
--- a/BIN/SH.S.CORE.txt
+++ b/BIN/SH.S.CORE.txt
@@ -267,12 +267,14 @@ CORE.ArgV.Add	>LDYA ZPArgVBufPtr
 .2				cmp #C.SPACE
 				bne .3
 				txa						between "" ?
-				beq .5
+				beq .5					no...exit
+				lda #C.SPACE
+				bra .31
 				
 .3				jsr CORE.IsEndCmd
 				bcc .5
 
-				jsr CORE.ArgV.PutChar
+.31				jsr CORE.ArgV.PutChar
 				
 .4				jsr CORE.GetNextChar
 				bcc .1
diff --git a/SYS/KERNEL.S.DEV.txt b/SYS/KERNEL.S.DEV.txt
index 02cee376..8f1a894c 100644
--- a/SYS/KERNEL.S.DEV.txt
+++ b/SYS/KERNEL.S.DEV.txt
@@ -49,7 +49,7 @@ K.GetDev.9		rts
 */--------------------------------------
 * # GetDevStatus
 * ## C 
-* `int getdevstatus(short int hDEV, S.DIB* dstat);`
+* `int getdevstatus(short int DevID, S.DIB* dstat);`
 * ## ASM
 * `>PUSHWI S.DIB`
 * `lda DevID`