diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index dcb775ca..d790992d 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 055ee951..3c2581e8 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -536,6 +536,26 @@ CMD.FUNC
 .9				jmp CMD.Exec.CSYN
 *--------------------------------------
 CMD.RETURN
+.9				jmp CMD.Exec.CSYN
+*--------------------------------------
+CMD.BREAK		jsr CORE.StkGetCtx		Get context in CORE.Test
+				bcs .9
+				
+				tax
+				and #$3F
+				cmp #C.CASE
+				bne .9
+				
+				txa
+				bpl .8
+				
+				jsr CORE.StkPull		remove C.CASE
+				jsr CORE.StkGet
+				and #$7F
+				sta (pDATA),y
+.8				clc
+				rts
+
 .9				jmp CMD.Exec.CSYN
 *--------------------------------------
 * stack-1		hVALUE
@@ -573,9 +593,7 @@ CMD.CASE		jsr CORE.StkGetCtx		Get context in CORE.Test
 				cmp #C.CASE
 				bne .9
 				
-				jsr CORE.StkPull		remove C.SWITCH
-				jsr CORE.StkPull		get hVALUE
-				>SYSCALL freemem
+				jsr CORE.StkPull		remove C.CASE
 				bra CMD.CASE
 				
 .1				jsr EXP.GET
@@ -600,7 +618,7 @@ CMD.CASE		jsr CORE.StkGetCtx		Get context in CORE.Test
 *--------------------------------------
 CMD.DEFAULT		jsr CORE.StkGetCtx		Get context in CORE.Test
 				bcs .9
-				
+
 				and #$3F
 				cmp #C.SWITCH
 				beq .1
@@ -610,31 +628,11 @@ CMD.DEFAULT		jsr CORE.StkGetCtx		Get context in CORE.Test
 				
 				jsr CORE.StkPull		remove C.CASE
 
-.1				lda #$80
-				>ORA.G CORE.Test
+.1				jsr CORE.StkGet
+				and #$C0
 				ora #C.DEFAULT
 				jmp CORE.StkPush
 				
-.9				jmp CMD.Exec.CSYN
-*--------------------------------------
-CMD.BREAK		jsr CORE.StkGetCtx		Get context in CORE.Test
-				bcs .9
-				
-				tax
-				and #$3F
-				cmp #C.CASE
-				bne .9
-				
-				txa
-				bpl .8
-				
-				jsr CORE.StkPull		remove C.CASE
-				jsr CORE.StkGet
-				and #$7F
-				sta (pDATA),y
-.8				clc
-				rts
-
 .9				jmp CMD.Exec.CSYN
 *--------------------------------------
 CMD.END			jsr CORE.StkGetCtx		Get context in CORE.Test
diff --git a/BIN/SH.S.CORE.txt b/BIN/SH.S.CORE.txt
index 06d8b161..ea9c1396 100644
--- a/BIN/SH.S.CORE.txt
+++ b/BIN/SH.S.CORE.txt
@@ -138,7 +138,7 @@ CORE.Run		>LDYA ZPInputBufPtr		Save Actual cmd for looping
 				bmi .45
 				
 				and #$3F
-				cmp #C.FOR				FOR....FI ?
+				cmp #C.SWITCH			SWITCH....FI ?
 				bcs .7
 
 .45				txa
diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt
index a54d6d94..fe7914fd 100644
--- a/BIN/SH.S.txt
+++ b/BIN/SH.S.txt
@@ -30,10 +30,10 @@ C.PUSHD			.EQ 32
 C.POPD			.EQ 34
 C.FUNC			.EQ 36
 C.RETURN		.EQ 38
-C.SWITCH		.EQ 40
-C.CASE			.EQ 42
-C.DEFAULT		.EQ 44
-C.BREAK			.EQ 46
+C.BREAK			.EQ 40
+C.SWITCH		.EQ 42
+C.CASE			.EQ 44
+C.DEFAULT		.EQ 46
 C.END			.EQ 48
 *--------------------------------------
 C.FOR			.EQ 50
@@ -141,10 +141,10 @@ J.CMD			.DA CMD.NOHUP
 				.DA CMD.POPD
 				.DA CMD.FUNC
 				.DA CMD.RETURN
+				.DA CMD.BREAK
 				.DA CMD.SWITCH
 				.DA CMD.CASE
 				.DA CMD.DEFAULT
-				.DA CMD.BREAK
 				.DA CMD.END
 				.DA CMD.FOR
 				.DA CMD.WHILE
@@ -602,10 +602,10 @@ CMD				.AZ "NOHUP"
 				.AZ "POPD"
 				.AZ "FUNC"
 				.AZ "RETURN"
+				.AZ "BREAK"
 				.AZ "SWITCH"
 				.AZ "CASE"
 				.AZ "DEFAULT"
-				.AZ "BREAK"
 				.AZ "END"
 				.AZ "FOR"
 				.AZ "WHILE"
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index 050a6745..7124485e 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -219,7 +219,7 @@ INPUT.LINEIN	ldy #INPUT.Status
 				rts
 *--------------------------------------
 CS.END
-MSG.NOPASSWD	.AS "\r\nA2osX-LOGIN:No ETC/PASSWD file present, Logged as ROOT.\r\n"
+MSG.NOPASSWD	.AS "\r\n\r\nA2osX-Login:No ETC/PASSWD file present, Logged as ROOT.\r\n"
 				.AZ "Consider adding ROOT password with USERADD command.\r\n\r\n"
 MSG.LOGIN		.AZ "\r\nlogin:"
 MSG.PASSWORD	.AZ "\r\npassword:"