diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index d31aea99..e5cbec56 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt
index 35b71c8a..e26adbfe 100644
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@@ -202,8 +202,8 @@ CS.QUIT			ldy #hLineBuffer
 .8				lda (pData),y
 				beq .9
 				>SYSCALL FreeMem
-				clc
-.9				rts
+.9				clc
+				rts
 *--------------------------------------
 CharIn			tax
 
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index c80d81c4..6a76a977 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -854,7 +854,7 @@ CMD.DEFAULT		jsr CORE.StkGetCtx		Get context in CORE.Test
 				
 .9				jmp CMD.Exec.CSYN
 *--------------------------------------
-CMD.END			jsr CORE.StkGetCtx		Get context in CORE.Test
+				jsr CORE.StkGetCtx		Get context in CORE.Test
 				bcs CMD.END.CSYN
 				
 				and #$3F
@@ -862,17 +862,17 @@ CMD.END			jsr CORE.StkGetCtx		Get context in CORE.Test
 				beq CMD.END.FUNC
 
 				cmp #C.SWITCH
-				beq .2
+				beq .3
 				
 				cmp #C.CASE
-				beq .1
+				beq .2
 				
 				cmp #C.DEFAULT
 				bne CMD.END.CSYN
 				
-.1				jsr CORE.StkPull		remove C.CASE,C.DEFAULT
+.2				jsr CORE.StkPull		remove C.CASE,C.DEFAULT
 				
-.2				jsr CORE.StkPull		remove C.SWITCH
+.3				jsr CORE.StkPull		remove C.SWITCH
 				jsr CORE.StkPull		get hVALUE
 				>SYSCALL freemem			
 				rts
@@ -1295,7 +1295,7 @@ CMD.IF			jsr CORE.StkGetCtx
 				cmp #C.WHILE
 				bne .8
 				
-				>LDYA ZPInputBufPtr
+				>LDYA ZPInputCmdPtr
 				jsr CORE.StkPushYA		Push BEFORE WHILE/IF
 				bcs .9
 				
@@ -1307,7 +1307,7 @@ CMD.IF			jsr CORE.StkGetCtx
 *--------------------------------------
 CMD.LOOP		jsr CORE.StkPull
 				bcs .9
-				
+
 				tax
 				and #$3F
 				cmp #C.WHILE
diff --git a/BIN/SH.S.CORE.txt b/BIN/SH.S.CORE.txt
index 28f0133e..17a9ccfd 100644
--- a/BIN/SH.S.CORE.txt
+++ b/BIN/SH.S.CORE.txt
@@ -240,43 +240,9 @@ CORE.ExecExtCmd.Exit
 .8				clc
 .9				rts
 *--------------------------------------
-CORE.AddFunc	ldy #$ff
-
-.1				iny
-				lda (ZPInputBufPtr),y
-				beq .9
-				
-				cmp #C.SPACE
-				beq .1
-				
-				jsr ToUpperCase
-				cmp #'E'
-				bne .8
-				
-				iny
-				lda (ZPInputBufPtr),y
-				beq .9
-				
-				jsr ToUpperCase
-				cmp #'N'
-				bne .8
-
-				iny
-				lda (ZPInputBufPtr),y
-				beq .9
-				
-				jsr ToUpperCase
-				cmp #'D'
-				bne .8
-				
-				iny
-				lda (ZPInputBufPtr),y
-				beq .9
-				
-				cmp #C.SPACE
-				beq .7
-				cmp #C.CR
-				bne .9
+CORE.AddFunc	>LDYA L.CMD.END
+				jsr CORE.LookupInputBuf
+				bcs .8
 				
 .7				lda #0
 				>STA.G bFuncMode
diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt
index 655b5f20..b3f52d2b 100644
--- a/BIN/SH.S.txt
+++ b/BIN/SH.S.txt
@@ -36,18 +36,18 @@ C.BREAK			.EQ 22
 C.SWITCH		.EQ 23
 C.CASE			.EQ 24
 C.DEFAULT		.EQ 25
-C.END			.EQ 26
 *--------------------------------------
-C.FOR			.EQ 27
+C.FOR			.EQ 26
 C.FOR.LIST			.EQ 0
 C.FOR.FILE			.EQ 2
 C.FOR.EXEC			.EQ 4
-C.WHILE			.EQ 28
-C.IF			.EQ 29
-C.NEXT			.EQ 30
-C.LOOP			.EQ 31
-C.ELSE			.EQ 32
-C.FI			.EQ 33
+C.WHILE			.EQ 27
+C.IF			.EQ 28
+C.NEXT			.EQ 29
+C.LOOP			.EQ 30
+C.ELSE			.EQ 31
+C.FI			.EQ 32
+C.END			.EQ 33
 *--------------------------------------
 E.CSYN			.EQ $C0
 E.ESYN			.EQ $C1
@@ -125,6 +125,7 @@ J.ESC			.DA CL.BS			left arrow
 				.DA CL.NAK			right arow
 L.IN			.DA IN
 L.CMD			.DA CMD
+L.CMD.END		.DA CMD.END
 J.CMD			.DA CMD...
 				.DA CMD..
 				.DA CMD.CD
@@ -151,7 +152,6 @@ J.CMD			.DA CMD...
 				.DA CMD.SWITCH
 				.DA CMD.CASE
 				.DA CMD.DEFAULT
-				.DA CMD.END
 				.DA CMD.FOR
 				.DA CMD.WHILE
 				.DA CMD.IF
@@ -159,6 +159,7 @@ J.CMD			.DA CMD...
 				.DA CMD.LOOP
 				.DA CMD.ELSE
 				.DA CMD.FI
+				.DA CMD.END
 J.NEXT			.DA CMD.NEXT.LIST
 				.DA CMD.NEXT.FILE
 				.DA CMD.NEXT.EXEC				
@@ -628,7 +629,6 @@ CMD				.AZ ".."
 				.AZ "SWITCH"
 				.AZ "CASE"
 				.AZ "DEFAULT"
-				.AZ "END"
 				.AZ "FOR"
 				.AZ "WHILE"
 				.AZ "IF"
@@ -636,6 +636,7 @@ CMD				.AZ ".."
 				.AZ "LOOP"
 				.AZ "ELSE"
 				.AZ "FI"
+CMD.END			.AZ "END"
 				.HS 00
 *--------------------------------------
 * https://www.tldp.org/LDP/abs/html/io-redirection.html