diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index dd06a448..34c1bd30 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SHELL.S.CMD.txt b/BIN/SHELL.S.CMD.txt
index 6399d7d2..fc6d16b4 100644
--- a/BIN/SHELL.S.CMD.txt
+++ b/BIN/SHELL.S.CMD.txt
@@ -276,7 +276,7 @@ Cmd.INT.SET.1	>STZ.G CMD.Varname
 				
 				bcs .99
 				
-				>PUSHEA.G M32.Buf
+				>PUSHYA
 				>LDA.G CMD.Varname
 				tax
 				jsr Cmd.GetArgX
@@ -286,7 +286,7 @@ Cmd.INT.SET.1	>STZ.G CMD.Varname
 .8				clc
 				rts
 				
-.99				lda #E.SYN
+.99				lda #E.SYNTAX
 				sec
 				rts
 				
@@ -820,13 +820,14 @@ Cmd.GetEXP		>LDA.G CMD.ArgIndex
 				bcc .1
 				
 				>LDA.G CMD.ArgIndex		no op, return text value
+				tax
 				jsr Cmd.GetArgX
 				rts
 				
 .1				>PUSHYA
 				>LDYA L.CMD.IF.TOKEN4	+ - .... ?
 				jsr Lookup
-				bcs .9
+				bcs .90
 				txa
 				>STA.G CMD.Operator		
 
@@ -849,7 +850,7 @@ Cmd.GetEXP		>LDA.G CMD.ArgIndex
 
 				>PULLL.G M32.ARG
 				jsr .80
-				bcs .9
+.90				bcs .9
 				
 				>PUSHL.G M32.ACC
 				>PUSHBI 4		
@@ -857,6 +858,9 @@ Cmd.GetEXP		>LDA.G CMD.ArgIndex
 				>LDYA L.M32.Printf
 				>SYSCALL sprintf
 				bcs .9
+				
+				>LEA.G M32.Buf
+				
 				rts
 				
 .9				lda #E.BADEXP
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index f6efcb54..38798ad2 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -94,7 +94,6 @@ CS.RUN			lda #0
 				lda #C.LF
 				>SYSCALL PutChar
 				bcs .9
-				
 				jsr CS.RUN.SETENV
 				bcs .9
 				>PUSHBI S.PS.F.HOLD
@@ -102,13 +101,13 @@ CS.RUN			lda #0
 				>SYSCALL ExecL
 				rts
 *--------------------------------------
-CS.RUN.SETENV	>PUSHW L.ENV.HOME
-				>LDYA L.HOME
+CS.RUN.SETENV	>PUSHW L.HOME
+				>LDYA L.ENV.HOME
 				>SYSCALL setenv
 				bcs .9
 				
-				>PUSHW L.ENV.SHELL
-				>LDYA L.SHELL
+				>PUSHW L.SHELL
+				>LDYA L.ENV.SHELL
 				>SYSCALL setenv
 				bcs .9
 				
@@ -205,7 +204,7 @@ MSG.LOGIN		.AZ "\r\nlogin:"
 MSG.PASSWORD	.AZ "\r\npassword:"
 ENV.SHELL		.AZ "SHELL"
 ENV.HOME		.AZ "HOME"
-SHELL			.AZ "${ROOT}SBIN/SHELL"
+SHELL			.AZ "${ROOT}BIN/SHELL"
 HOME			.AZ "${ROOT}ROOT"
 				.HS 00
 *--------------------------------------