diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 8e94e6cc..13363985 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SH.S.EXP.txt b/BIN/SH.S.EXP.txt
index 8d30f6c3..9c6c9506 100644
--- a/BIN/SH.S.EXP.txt
+++ b/BIN/SH.S.EXP.txt
@@ -94,13 +94,17 @@ EXP.TEST		lda (ZPArgVBufPtr)
 
 				jsr CORE.ArgV.Next
 				beq .9
+
 .8				cmp #']'
 				bne .9
+
 				ldy #1
 				lda (ZPArgVBufPtr),y
 				bne .9
+
 				jsr CORE.ArgV.Next
 				beq .80
+
 				>LDYA L.EXP.OP.LOGIC
 				jsr CORE.LookupArgVBuf
 				bcs .9
@@ -136,7 +140,8 @@ EXP.TEST.UNARY 	jsr CORE.ArgV.Next
 EXP.OP.UNARY.ESYN
 				jmp EXP.E.ESYN
 
-EXP.OP.UNARY.D	jsr IO.StatArgVBufPtr
+EXP.OP.UNARY.D	
+				jsr IO.StatArgVBufPtr
 				bcs EXP.OP.UNARY.DEF.9
 
 				cmp #S.FI.T.DIR
@@ -164,7 +169,7 @@ EXP.OP.UNARY.DEF.9
 				lda #0
 				rol
 				
-				clc
+*				clc
 EXP.OP.UNARY.DEF.RTS
 				rts
 *--------------------------------------
@@ -187,15 +192,19 @@ EXP.OP.UNARY.N	jsr EXP.OP.UNARY.Z
 EXP.OP.UNARY.Z	lda (ZPArgVBufPtr)		[ -Z ] ?
 
 				cmp #']'
-				beq EXP.OP.UNARY.DEF.8	TRUE
+				bne .1
+				lda #$80				TRUE
+				clc
+				rts
 
-				jsr CORE.ArgV.Next
+.1				jsr CORE.ArgV.Next
 				beq EXP.TEST.BINARY.ESYN
 
-				cmp #']'
+				eor #']'
 				bne EXP.TEST.BINARY.ESYN
 
-				bra EXP.OP.UNARY.DEF.9	FALSE
+				clc						FALSE
+				rts
 *--------------------------------------
 EXP.OP.UNARY.X	jsr CMD.CALL.GETFUNC
 				bcs EXP.OP.UNARY.DEF.9	FALSE
diff --git a/SYS/KERNEL.S.DRV.txt b/SYS/KERNEL.S.DRV.txt
index 315e4621..04349718 100644
--- a/SYS/KERNEL.S.DRV.txt
+++ b/SYS/KERNEL.S.DRV.txt
@@ -149,8 +149,14 @@ DRV.SmartPort	cld
 				lsr
 				sta .2
 				tax
-				lda DRV.SmartPort.Cnt-1,x
-				sta (pIOCTL)			CmdList
+				lda DRV.SmartPort.Cnt,x
+				sta (pIOCTL)			S.IOCTL.CNT
+
+				ldy #S.FD.DEV.DEVID
+				lda (pFD),y
+				ldy #S.IOCTL.UNITNUM
+				sta (pIOCTL),y
+
 				ldy #S.FD.DEV.BUSPTR
 				lda (pFD),y
 				sta .1+1