diff --git a/SYS/KERNEL.S.DIR.txt b/SYS/KERNEL.S.DIR.txt
index c73c2016..3afac006 100644
--- a/SYS/KERNEL.S.DIR.txt
+++ b/SYS/KERNEL.S.DIR.txt
@@ -76,9 +76,10 @@ S.READDIRA		jsr S.PFTCHECKDIRA
 				>STYA ZPQuickPtr1
 				ldy #S.DIR.PRODOS.REF
 				lda (ZPQuickPtr1),y
-				bne .
+				beq S.READDIRA.ROOT
+				jmp S.READDIRA.DIR
 				
-				>PUSHWI 256				Get Buffer for ONLINE call
+S.READDIRA.ROOT	>PUSHWI 256				Get Buffer for ONLINE call
 				>PUSHBI 0
 				jsr S.GetMem
 				bcs .99
@@ -87,7 +88,7 @@ S.READDIRA		jsr S.PFTCHECKDIRA
 				stz MLICALL.PARAMS+1
 				>STYA MLICALL.PARAMS+2
 				>MLICALL MLIONLINE
-				bcs .
+				bcs .98
 				
 				lda #1					Ending 0
 				sta	BufSize
@@ -129,6 +130,16 @@ S.READDIRA		jsr S.PFTCHECKDIRA
 				jsr S.GetMem
 				bcs .98
 				>STYA ZPQuickPtr3
+				>STYA ZPQuickPtr4
+				
+				ldy #0
+				
+.1				lda (ZPQuickPtr2),y
+				and #$0F
+				beq .2
+				
+				
+				lda #0		A=0, CS no more DIRENT
 				
 .98				pha
 				lda hONLINE
@@ -136,6 +147,10 @@ S.READDIRA		jsr S.PFTCHECKDIRA
 				pla
 				sec
 .99				rts
+
+S.READDIRA.DIR
+				clc
+				rts
 *--------------------------------------
 * In : 
 *  A = hDIR
diff --git a/SYS/KERNEL.S.FIL.txt b/SYS/KERNEL.S.FILE.txt
similarity index 95%
rename from SYS/KERNEL.S.FIL.txt
rename to SYS/KERNEL.S.FILE.txt
index 7bd070f7..4cbffeb6 100644
--- a/SYS/KERNEL.S.FIL.txt
+++ b/SYS/KERNEL.S.FILE.txt
@@ -312,6 +312,6 @@ FIL.SetupPrt1A	jsr S.GetMemPtrA
 				rts
 *--------------------------------------				
 MAN
-SAVE SYS/KERNEL.S.FIL
+SAVE SYS/KERNEL.S.FILE
 LOAD SYS/KERNEL.S
 ASM
diff --git a/SYS/KERNEL.S.TIME.txt b/SYS/KERNEL.S.TIME.txt
index 22fa4fd1..9e5e5456 100644
--- a/SYS/KERNEL.S.TIME.txt
+++ b/SYS/KERNEL.S.TIME.txt
@@ -157,8 +157,9 @@ S.CTime2Time	>PULLW ZPQuickPtr1
 				sta S.CTime.Century
 				lda #YEAR0
 				sta S.CTime.Year
-				
-.9				ldy S.CTime.Century
+
+S.CTime2Time.Year				
+.1				ldy S.CTime.Century
 				lda S.CTime.Year
 				jsr S.IsLeapYearYA 		if Leap year CC
 				lda S.CTime.DivDay
@@ -166,7 +167,7 @@ S.CTime2Time	>PULLW ZPQuickPtr1
 				pha
 				lda S.CTime.DivDay+1
 				sbc /365
-				bcc .10
+				bcc .2
 				
 				sta S.CTime.DivDay+1
 				pla
@@ -175,12 +176,12 @@ S.CTime2Time	>PULLW ZPQuickPtr1
 				inc S.CTime.Year
 				lda S.CTime.Year
 				cmp #100
-				bne .9
+				bne .1
 				stz S.CTime.Year
 				inc S.CTime.Century
-				bne .9
+				bne .1
 				
-.10				pla
+.2				pla
 				lda S.CTime.Century
 *				ldy #S.TIME.CENTURY
 				sta (ZPQuickPtr2)
@@ -188,7 +189,8 @@ S.CTime2Time	>PULLW ZPQuickPtr1
 				lda S.CTime.Year
 				sta (ZPQuickPtr2),y
 				
-				
+				clc
+				rts
 *--------------------------------------
 S.CTime.DWORD	.BS 4				
 S.CTime.DivDay	.BS 2				
diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt
index 7627c07b..b0ea1079 100644
--- a/SYS/KERNEL.S.txt
+++ b/SYS/KERNEL.S.txt
@@ -93,8 +93,10 @@ A2osX.E000		 .EQ *
 				.INB SYS/KERNEL.S.TSK
 				.INB SYS/KERNEL.S.PS
 *--------------------------------------
+				.INB SYS/KERNEL.S.TIME
 				.INB SYS/KERNEL.S.PFT
-				.INB SYS/KERNEL.S.FIL
+				.INB SYS/KERNEL.S.FILE
+				.INB SYS/KERNEL.S.DIR
 *--------------------------------------
 * Make sure KERNEL.S.DEV is the last one
 *--------------------------------------