diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index d6770b4f..c48de1ae 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/CC.S.CODE.txt b/BIN/CC.S.CODE.txt
index 08c3a134..1bd46614 100644
--- a/BIN/CC.S.CODE.txt
+++ b/BIN/CC.S.CODE.txt
@@ -333,7 +333,7 @@ CODE.CSSelect	clc
 
 				>PUSHB.G CC.hOutFile
 				>PUSHWZ
-			>DEBUG
+*			>DEBUG
 				lda ZPCCCode+1
 				sec
 				sbc #$20
@@ -351,7 +351,7 @@ CODE.DSSelect	clc
 
 				>PUSHB.G CC.hOutFile
 				>PUSHWZ
-			>DEBUG
+*			>DEBUG
 				lda PCC.FH+PCC.FH.CONST
 				clc
 				adc ZPCCConst
diff --git a/BIN/CC.S.CORE.txt b/BIN/CC.S.CORE.txt
index ba9dccd9..2012b2cf 100644
--- a/BIN/CC.S.CORE.txt
+++ b/BIN/CC.S.CORE.txt
@@ -128,7 +128,7 @@ CORE.CompileLine
 
 				jmp DIR
 
-.1				bit DirState			FALSE state
+.1				>LDA.G CC.DirState		FALSE state
 				bmi .8
 
 				cmp #'/'
@@ -212,7 +212,8 @@ CORE.CompileStmt
 				sec
 .9				rts
 *--------------------------------------
-CORE.Comments	jsr CC.GetNextChar		TODO : /* ... */
+CORE.Comments	jsr CC.GetNextChar
+
 				cmp #'/'
 				beq .8					// skip line.....
 				
@@ -232,7 +233,7 @@ CORE.Comments	jsr CC.GetNextChar		TODO : /* ... */
 				bne .1
 				
 				jmp CC.GetNextChar
-
+				
 .8				clc
 				rts
 
@@ -246,6 +247,8 @@ CORE.SkipLine	jsr CC.GetNextChar
 				cmp #C.CR
 				bne CORE.SkipLine
 
+				jsr CC.GetNextChar
+
 				clc
 
 .9				rts
diff --git a/BIN/CC.S.DECL.txt b/BIN/CC.S.DECL.txt
index ea6b6202..2ba1d355 100644
--- a/BIN/CC.S.DECL.txt
+++ b/BIN/CC.S.DECL.txt
@@ -33,8 +33,6 @@ DECL.TYPEDEF	jsr CORE.GetNCharNB
 				cmp #';'
 				bne .98
 
-				jsr CORE.GetNCharNB	skip ';'
-
 				jmp SYM.Store
 
 .98				lda #E.CSYN
diff --git a/BIN/CC.S.DIR.txt b/BIN/CC.S.DIR.txt
index f7ef203b..da6e45ff 100644
--- a/BIN/CC.S.DIR.txt
+++ b/BIN/CC.S.DIR.txt
@@ -141,28 +141,32 @@ DIR.IFNDEF		clc
 				eor ZPPtr1
 				asl
 				
-				lda DirState
+				>LDA.G CC.DirState
 				rol
 				ora #1
-				sta DirState
+				sta (pData),y
+				>DEC.G CC.DirDepth
 				clc
 				rts
 *--------------------------------------
-DIR.ELSE		lda DirState
+DIR.ELSE		>LDA.G CC.DirDepth
 				beq DIR.ESYN
 				
+				>LDA.G CC.DirState
 				eor #$80
-				sta DirState
+				sta (pData),y
 				clc
 				rts
 *--------------------------------------
-DIR.ENDIF		lda DirState
+DIR.ENDIF		>LDA.G CC.DirDepth
 				beq DIR.ESYN
+				
+				dec
+				sta (pData),y
 
-				and #$FE
-				sec
+				>LDA.G CC.DirState
 				asl
-				sta DirState
+				sta (pData),y
 				
 				clc
 				rts
diff --git a/BIN/CC.S.EXP.txt b/BIN/CC.S.EXP.txt
index ea79b56e..c7fbf10b 100644
--- a/BIN/CC.S.EXP.txt
+++ b/BIN/CC.S.EXP.txt
@@ -409,7 +409,7 @@ EXP.GetChar		ldy ZPPtr2+1
 EXP.AddConstCharP
 				lda ZPCCConst
 				ldx ZPCCConst+1
-
+			>DEBUG
 				jsr CODE.LDAXI
 				bcs .99
 
diff --git a/BIN/CC.S.txt b/BIN/CC.S.txt
index d0baa2ea..b69a3ca3 100644
--- a/BIN/CC.S.txt
+++ b/BIN/CC.S.txt
@@ -117,7 +117,7 @@ ExpState		.BS 1
 ExpState.AonStack	.EQ $20
 ExpState.AinPTR		.EQ $40
 ExpState.VonStack	.EQ $80
-DirState		.BS 1
+*				.BS 1
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -1140,6 +1140,9 @@ CC.hDefineBuf	.BS 1
 CC.hDefines		.BS 1
 CC.SaveDefine	.BS 2
 
+CC.DirState		.BS 1
+CC.DirDepth		.BS 1
+
 CC.hTags		.BS 1
 CC.hScopeStk	.BS 1
 CC.hStmtStk		.BS 1