diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index d3786ea5..7f6ac850 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/ASM.S.DIR.txt b/BIN/ASM.S.DIR.txt
index 372ed39f..2443619b 100644
--- a/BIN/ASM.S.DIR.txt
+++ b/BIN/ASM.S.DIR.txt
@@ -135,31 +135,34 @@ DIR.DA			jsr SRC.GetNextCharNB
 .1				jsr EXP.Eval
 				bcs .9
 				
+				ldy #0
 				ldx SRC.ACC.SIZE
-				bne .10
-			>DEBUG
-				ldx #2
-.10				ldy #0
+				beq *
 
 .2				lda SRC.ACC,y
 				jsr OUT.EmitByte
 				bcs .9
+				
 				iny
 				dex
 				bne .2
-.3				jsr	SRC.GetNextChar
-				bcs .8
 				
+.3				jsr	SRC.GetChar
+				bcs .8
+
 				cmp #C.SPACE
 				beq .8
 				
 				cmp #','
 				bne .98
+	
 				jsr	SRC.GetNextChar
 				bcc .1
+				
 .98				lda #E.SYNTAX.ERROR
-				clc
+				sec
 .9				rts
+
 .8				clc
 				rts
 *---------------------------------------
@@ -325,12 +328,6 @@ DIR.EQ			clc
 				dex
 				bpl .21
 
-			lda #'e'
-*			jsr OUT.DEBUG
-			
-			
-			>DEBUG	
-
 				clc
 				rts
 				
@@ -356,15 +353,19 @@ DIR.FI			>LDA.G ASM.DO.StackPtr
 *---------------------------------------
 DIR.HS			jsr SRC.GetNextCharNB
 				bcs .99
+				
 				jsr SRC.IsDigit16
 				bcs .99
+				
 .1				sta DIR.Byte
 				jsr	SRC.GetNextChar
 				bcc .2
 
 				jmp OUT.EmitByte
+				
 .2				jsr SRC.IsDigit16
 				bcc .3
+
 				cmp #','
 				beq .22
 
@@ -375,6 +376,7 @@ DIR.HS			jsr SRC.GetNextCharNB
 				jsr OUT.EmitByte
 				bcc .5
 				rts
+				
 .3				pha
 				sta DIR.Byte
 				asl
@@ -384,26 +386,35 @@ DIR.HS			jsr SRC.GetNextCharNB
 				sta DIR.Byte
 				pla
 				ora DIR.Byte
+				
 .4				jsr OUT.EmitByte
 				bcs .9
+				
 				jsr	SRC.GetNextChar
 				bcs .8
+				
 				cmp #C.SPACE
 				beq .8
+				
 				jsr SRC.IsDigit16
 				bcc .1
+				
 				cmp #','
 				beq .5
 
 				cmp #'.'
 				bne .99
+				
 .5				jsr	SRC.GetNextChar
 				bcs .99
+				
 				jsr SRC.IsDigit16
 				bcc .1
+				
 .99				lda #E.SYNTAX.ERROR
 				sec
 .9				rts	
+
 .8				clc
 				rts
 *---------------------------------------