diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 07d46aec..3f1ca108 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 d4a1dae9..edfc53f2 100644
--- a/BIN/SHELL.S.CMD.txt
+++ b/BIN/SHELL.S.CMD.txt
@@ -35,11 +35,15 @@ CMD.Quit		ldy #CMD.hArgVBuf
 Cmd.Exec		jsr CMD.StkGet			IF,WHILE,FOR ?
 				bcs .3					no particular context, exec...
 				tax
+				
+				>LDA.G CMD.IntCmd
+				bmi .2					external ...
+				
 				and #$3F
 				cmp #C.FOR
 				bcs .3					FOR...FI : always execute
 		
-				txa
+.2				txa
 				bpl .8 					context is FALSE, skip line
 				asl
 				bpl .8					parent context is FALSE, skip line
@@ -532,23 +536,23 @@ Cmd.INT.IF		jsr CMD.StkGet
 				bra .2
 				
 .1				lda #$40
+
 .2				>STA.G CMD.Test
-				>DEBUG
+
+				bit #$40
+				beq .3
 				jsr Cmd.Eval
 				bcs .9
 
-				tax
-
-				>LDA.G CMD.IntCmd
+.3				>LDA.G CMD.IntCmd
 				cmp #C.WHILE
 				bne .8
 				
 				jsr CMD.StkPushPtr
 				bcs .9
 				
-.8				txa
-				
-				>ORA.G CMD.Test
+.8				>LDA.G CMD.Test
+				>ORA.G CMD.IntCmd
 				jmp CMD.StkPush
 				
 				clc
@@ -557,7 +561,6 @@ Cmd.INT.IF		jsr CMD.StkGet
 Cmd.INT.ELSE	jsr CMD.StkGet
 				bcs .9
 
-				>DEBUG
 				bit #$40				parent is true ?
 				beq .8					yes, skip
 
@@ -610,10 +613,7 @@ Cmd.INT.LOOP	jsr CMD.StkPull
 				sec
 .99				rts				
 *--------------------------------------
-Cmd.Eval		lda #$40				Parent = true
-				>STA.G CMD.Test
-				
-				ldx #1
+Cmd.Eval		ldx #1
 				jsr Cmd.GetArgX
 				beq .9
 				
@@ -629,9 +629,10 @@ Cmd.Eval		lda #$40				Parent = true
 				dex						1 or $ff
 				
 				txa
+
 				and #$80				true or false
-				eor #$80
-				>STA.G CMD.Test
+				>ORA.G CMD.Test
+				sta (pData),y
 				
 				ldx #2
 				jsr Cmd.GetArgX
diff --git a/BIN/SHELL.S.txt b/BIN/SHELL.S.txt
index 1a36a28f..4e1231e9 100644
--- a/BIN/SHELL.S.txt
+++ b/BIN/SHELL.S.txt
@@ -632,11 +632,11 @@ CMD.Eval.TOKEN3	.AZ "="
 CMD.Eval.TOKEN3.BITS
 				.DA #%000
 				.DA #%000
-				.DA #%001
-				.DA #%110
-				.DA #%100
-				.DA #%101
 				.DA #%010
+				.DA #%101
+				.DA #%100
+				.DA #%110
+				.DA #%001
 				.DA #%011
 CMD.Eval.TOKEN4	.AZ "+"
 				.AZ "-"
diff --git a/X.M32.S.txt b/X.M32.S.txt
index 1ddc6f9e..6e45808c 100644
--- a/X.M32.S.txt
+++ b/X.M32.S.txt
@@ -128,13 +128,13 @@ M32.Cmp			ldx #4
 				
 				bne .4
 				
-				lda #%001				001 ACC = ARG
+				lda #%010				001 ACC = ARG
 				rts
 				
-.4				lda #%010				010 ACC > ARG
+.4				lda #%100				010 ACC > ARG
 				rts
 				
-.5				lda #%100				100	ACC < ARG
+.5				lda #%001				100	ACC < ARG
 				rts				
 *--------------------------------------
 MAN