diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index c8b38eec..1cc8e7ed 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/PAK.S.txt b/BIN/PAK.S.txt
index 0a903a12..fec65c45 100644
--- a/BIN/PAK.S.txt
+++ b/BIN/PAK.S.txt
@@ -50,8 +50,10 @@ L.MSG.OK		.DA MSG.OK
 L.MSG.ERR		.DA MSG.ERR
 				.DA 0
 *--------------------------------------
-CS.INIT			
-.1				>INC.G ArgIndex
+CS.INIT			clc
+				rts
+*--------------------------------------
+CS.RUN			>INC.G ArgIndex
 				>SYSCALL ArgV
 				bcs .8
 				>STYA ZPPtr1
@@ -70,30 +72,30 @@ CS.INIT
 				dex
 				bne .2
 				
-.99				>PUSHBI 0
+.9				>PUSHBI 0
 				>LDYA L.MSG.USAGE
 				>SYSCALL printf
 				lda #E.SYN
 				sec
-				rts
+.99				rts
 				
 .3				ldy OptionVars-1,x
 				lda #$80
 				sta (pData),y
-				bra .1
+				bra CS.RUN
 *--------------------------------------
 .4				>LDA.G ArcName
 				bne .5
 				
-				bcc .1
+				bcc CS.RUN
 				rts
 				
 .5				>LDA.G hSrcFullPath
-				bne .99
+				bne .9
 				
 				>LDYA ZPPtr1
 				jsr InitSrcDirYA
-				bcc .1
+				bcc CS.RUN
 				rts
 				
 .8				>LDYAI 256
@@ -102,11 +104,8 @@ CS.INIT
 				>STYA ZPFullPath
 				txa
 				>STA.G hSrcFullPath
-				
-				clc
-				rts
 *--------------------------------------
-CS.RUN			ldy #S.PS.hStdIn
+CS.RUN.LOOP		ldy #S.PS.hStdIn
 				lda (pPS),y
 				>SYSCALL feof
 				bcs .99
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 3b51e9d7..c214ad75 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -645,7 +645,6 @@ CMD.CALL.YAX	stx M32.ACC				X=Code to Execute
 				lda #$C0
 				jsr CORE.StkPush
 				
-				>INC.G bBatchMode
 				clc				
 .9				rts
 *--------------------------------------
@@ -664,7 +663,7 @@ CMD.EXIT		lda (ZPArgVBufPtr)
 				inc pStack
 				
 CMD.EXIT.A		sta M32.ACC
-				>DEBUG
+
 .1				jsr CORE.StkPull
 				bcs	CMD.EXIT.RTS
 				
@@ -672,11 +671,10 @@ CMD.EXIT.A		sta M32.ACC
 				beq .8
 				
 				and #$3F
-				ldx #1
 				cmp #C.IF
-				beq .3
+				beq .1
 				
-.2				ldx #3
+.2				ldx #2
 				cmp #C.WHILE
 				bne CMD.EXIT.99
 				
@@ -686,7 +684,7 @@ CMD.EXIT.A		sta M32.ACC
 				dex
 				bne .4
 
-				sta (pData)
+.5				sta (pData)
 				bra .1
 				
 .8				jsr CORE.StkPull
@@ -711,13 +709,8 @@ CMD.EXIT.A		sta M32.ACC
 				
 				jsr CORE.StkPull
 				sta ZPInputBuf
-				
-				>DEC.G bBatchMode
-				
-				pha
-				lda #$FF
-				>STA.G bExit
-				pla
+
+				lda M32.ACC
 				clc
 CMD.EXIT.RTS	rts
 
diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt
index 588bbc87..bada36aa 100644
--- a/BIN/SH.S.txt
+++ b/BIN/SH.S.txt
@@ -271,7 +271,7 @@ CS.RUN.LOOP		>SLEEP
 				cmp #3					Ctrl-C
 				bne CS.RUN.LOOP
 				
-				>LDA.G bBatchMode		batch mode ?
+				lda (pData)				batch mode ?
 				beq CS.RUN.LOOP
 				
 				>LDA.G bSET.C
@@ -287,7 +287,7 @@ CS.RUN.LOOP		>SLEEP
 .5				cmp #3					Ctrl-C
 				bne .60
 				
-				>LDA.G bBatchMode		batch mode ?
+				lda (pData)				batch mode ?
 				beq .61
 				
 				>LDA.G bSET.C
@@ -303,7 +303,7 @@ CS.RUN.LOOP		>SLEEP
 .6				>LDA.G bReadMode		read mode ?
 				bne .7
 				
-.62				>LDA.G bBatchMode		batch mode ?
+.62				lda (pData)				batch mode ?
 				beq CS.RUN.INTERACTIVE
 				jmp CS.RUN.BATCH
 .7				jmp CS.RUN.READ
@@ -463,7 +463,7 @@ CS.RUN.LOOP.END	ldy #S.PS.RC
 				bcc CS.RUN.LOOP.8
 				tay
 				beq CS.RUN.LOOP.8
-				>LDA.G bBatchMode			batch mode ?
+				lda (pData)					batch mode ?
 				beq .1
 				
 				>LDA.G bSET.E
@@ -710,7 +710,6 @@ PUSHD.STACK		.BS PUSHD.STACK.MAX+1
 hFuncList		.BS 1
 
 bReadMode		.BS 1
-bBatchMode		.BS 1
 bFuncMode		.BS 1
 bExitOnEOF		.BS 1