diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index c6561831..95e64c1e 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Tools/ASM.T.xlsm b/.Tools/ASM.T.xlsm
index 5fe0ec0b..be371f28 100644
Binary files a/.Tools/ASM.T.xlsm and b/.Tools/ASM.T.xlsm differ
diff --git a/BIN/ASM.S.EXP.txt b/BIN/ASM.S.EXP.txt
index e579a6fe..cf1ad261 100644
--- a/BIN/ASM.S.EXP.txt
+++ b/BIN/ASM.S.EXP.txt
@@ -197,7 +197,7 @@ EXP.GetLocal	jsr SRC.GetNextChar
 				bne EXP.EvalExitSYN		Max .255
 				ldx SRC.ACC
 				beq EXP.EvalExitSYN		.0 is not allowed
-				
+
 				jsr SYM.GetLocalX
 				bcc .8
 				
diff --git a/BIN/ASM.S.OUT.txt b/BIN/ASM.S.OUT.txt
index 659312ac..3c3a3878 100644
--- a/BIN/ASM.S.OUT.txt
+++ b/BIN/ASM.S.OUT.txt
@@ -32,8 +32,8 @@ OUT.Reset		ldx #4
 				rts
 *---------------------------------------
 OUT.PrintLineOn
-*				clc
-*				rts
+				clc
+				rts
 				
 				>LDA.G ASM.LI.ON
 				bpl .9
diff --git a/BIN/ASM.S.SRC.txt b/BIN/ASM.S.SRC.txt
index ac8baaea..9c62b062 100644
--- a/BIN/ASM.S.SRC.txt
+++ b/BIN/ASM.S.SRC.txt
@@ -620,7 +620,7 @@ SRC.ExpandAddress
 				rts
 *---------------------------------------
 SRC.ComputeRel8	jsr SRC.ComputeRel
-
+				
 				bcc .1
 				
 * positive : check 0<r<0000007F
diff --git a/BIN/ASM.S.SYM.txt b/BIN/ASM.S.SYM.txt
index 6ec9f750..8ddaccb9 100644
--- a/BIN/ASM.S.SYM.txt
+++ b/BIN/ASM.S.SYM.txt
@@ -343,9 +343,10 @@ SYM.Acc2Global	ldy #SYMG-1
 
 				rts
 *---------------------------------------
-* Local Symbol Record: (5 bytes)
+* Local Symbol Record: (6 bytes)
 *  0 : Local ID (1->255)
-*  1-4 : 32 bits Value (PC)
+*  1 : Macro Context ID
+*  2-5 : 32 bits Value (PC)
 *---------------------------------------
 SYM.NewOrGetLocalA
 				tax						Save Local ID
@@ -386,11 +387,11 @@ SYM.NewOrGetLocalA
 				bne .2
 				
 				tya
-				>STA.G SYM.GlobalPtr
-
 				iny
 				lda #0
 				sta (ZPGlobalBuf),y
+				tya
+				>STA.G SYM.GlobalPtr
 				
 				lda (ZPGlobalBuf)
 				ora #SYMG.F.LOCALS
@@ -425,7 +426,7 @@ SYM.GetLocalX	lda (ZPGlobalBuf)
 				bne .3
 
 				ldx #0
-				
+
 .2				iny
 				lda (ZPGlobalBuf),y
 				sta SRC.ACC,x
diff --git a/BIN/ASM.S.txt b/BIN/ASM.S.txt
index 952dfe02..7eaf9139 100644
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@@ -454,10 +454,10 @@ MSG.PASS		.AZ "**** Pass:#%d ****"
 MSG.SRC.FILE	.AZ "**** Reading SRC File:%s"
 MSG.OBJ.FILE	.AZ "**** Writing OBJ File:%s, Type=%02x"
 MSG.T.FILE		.AZ "**** Loading CPU File:%s"
-MSG.OUT0		.AZ "%H-        "
-MSG.OUT1		.AZ "%H-%h      "
-MSG.OUT2		.AZ "%H-%h %h   "
-MSG.OUT3		.AZ "%H-%h %h %h"
+MSG.OUT0		.AZ "%H%H-        "
+MSG.OUT1		.AZ "%H%H-%h      "
+MSG.OUT2		.AZ "%H%H-%h %h   "
+MSG.OUT3		.AZ "%H%H-%h %h %h"
 MSG.EQU0		.AZ "  [       ?] "
 MSG.EQU1		.AZ "  [      %h] "
 MSG.EQU2		.AZ "  [    %h%h] "
diff --git a/BIN/ASM.T.6502.S.txt b/BIN/ASM.T.6502.S.txt
index 23c4d824..ef57f0b5 100644
--- a/BIN/ASM.T.6502.S.txt
+++ b/BIN/ASM.T.6502.S.txt
@@ -3,7 +3,7 @@ NEW
 AUTO 4,1
 				.LIST OFF
 				.OR $0
-				.TF BIN/DEV/ASM.T.6502
+				.TF BIN/ASM.T.6502
 *---------------------------------------
 				.DA T.ADDR.MODES
 				.DA T.REGISTERS
diff --git a/BIN/ASM.T.65816.S.txt b/BIN/ASM.T.65816.S.txt
index 42bb22e0..2982f78d 100644
--- a/BIN/ASM.T.65816.S.txt
+++ b/BIN/ASM.T.65816.S.txt
@@ -3,7 +3,7 @@ NEW
 AUTO 4,1
 				.LIST OFF
 				.OR $0
-				.TF BIN/DEV/ASM.T.65816
+				.TF BIN/ASM.T.65816
 *---------------------------------------
 				.DA T.ADDR.MODES
 				.DA T.REGISTERS
diff --git a/BIN/ASM.T.65C02.S.txt b/BIN/ASM.T.65C02.S.txt
index 173560f7..02fe961e 100644
--- a/BIN/ASM.T.65C02.S.txt
+++ b/BIN/ASM.T.65C02.S.txt
@@ -3,7 +3,7 @@ NEW
 AUTO 4,1
 				.LIST OFF
 				.OR $0
-				.TF BIN/DEV/ASM.T.65C02
+				.TF BIN/ASM.T.65C02
 *---------------------------------------
 				.DA T.ADDR.MODES
 				.DA T.REGISTERS
diff --git a/BIN/ASM.T.65R02.S.txt b/BIN/ASM.T.65R02.S.txt
index 50a703ba..3c8647e3 100644
--- a/BIN/ASM.T.65R02.S.txt
+++ b/BIN/ASM.T.65R02.S.txt
@@ -3,7 +3,7 @@ NEW
 AUTO 4,1
 				.LIST OFF
 				.OR $0
-				.TF BIN/DEV/ASM.T.65R02
+				.TF BIN/ASM.T.65R02
 *---------------------------------------
 				.DA T.ADDR.MODES
 				.DA T.REGISTERS
diff --git a/BIN/ASM.T.SW16.S.txt b/BIN/ASM.T.SW16.S.txt
index cc33ef9c..f9451f31 100644
--- a/BIN/ASM.T.SW16.S.txt
+++ b/BIN/ASM.T.SW16.S.txt
@@ -3,7 +3,7 @@ NEW
 AUTO 4,1
 				.LIST OFF
 				.OR $0
-				.TF BIN/DEV/ASM.T.SW16
+				.TF BIN/ASM.T.SW16
 *---------------------------------------
 				.DA T.ADDR.MODES
 				.DA T.REGISTERS
diff --git a/BIN/ASM.T.Z80.S.txt b/BIN/ASM.T.Z80.S.txt
index e5579262..c303b7db 100644
--- a/BIN/ASM.T.Z80.S.txt
+++ b/BIN/ASM.T.Z80.S.txt
@@ -3,7 +3,7 @@ NEW
 AUTO 4,1
 				.LIST OFF
 				.OR $0
-				.TF BIN/DEV/ASM.T.Z80
+				.TF BIN/ASM.T.Z80
 *---------------------------------------
 				.DA T.ADDR.MODES
 				.DA T.REGISTERS
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index b590757f..6ee0d00b 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -1098,7 +1098,7 @@ Mouse.SIG		.HS 38180120D6
 *--------------------------------------	
 TClock.SIG		.HS	0878282c58ff700538b00118b8087848
 				.HS 8a489848adffcf201ac86868ba8df807
-TClock.SIG.Cnt	.EQ *-TClock.SIG		
+TClock.SIG.Cnt	.EQ *-TClock.SIG
 *--------------------------------------
 MSG.Init2		.AZ "A2osX[Stage2]:Init\nRelocating Kernel...\n"
 MSG.HZ			.AZ "Kernel SYS Timer Set For %d0 hz Machine.\n"