diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 346190de..d2372973 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 4c6b5d8d..9f8ffd72 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -3,7 +3,7 @@ NEW
 				.LIST OFF	
 				.OP	65C02
 				.OR $2000
-				.TF DRV/GUI/DHGR.DRV
+				.TF drv/dhgr.drv
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt
index a41fd8cd..26f60b80 100644
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@@ -4,7 +4,7 @@ AUTO 4,1
 				.LIST OFF	
 				.OP	65C02
 				.OR $2000
-				.TF DRV/GUI/MOUSE.DRV
+				.TF drv/mouse.drv
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt
index b1d611ff..e29e59cd 100644
--- a/SYS/KERNEL.S.PS.txt
+++ b/SYS/KERNEL.S.PS.txt
@@ -267,18 +267,22 @@ PS.Load.SCRIPT	ldx #$ff
 .2				lda $ffff,x				SELF MODIFIED
 				sta K.Buf256,x			K.Buf256 = "$ROOT"
 				bne .1
+
 				ldy #0
+
 .3				lda K.IOBuf+128,y		Check HEADER= "#!/"
 				cmp PS.Load.HEADER,y
 				bne PS.Load.IBIN
 				iny
 				cpy #3
 				bne .3
+
 .4				iny
 				inx
 				lda K.IOBuf+128-1,y
 				sta K.Buf256-1,x		K.Buf256 = "${ROOT}BIN/SHELL"
 				beq .5
+
 				eor #C.CR
 				bne .4 
 	
@@ -295,6 +299,7 @@ PS.Load.SCRIPT	ldx #$ff
 *--------------------------------------
 PS.LoadBIN		jsr BIN.Load			K.Buf256= "${ROOT}BIN/SHELL\0", K.IOBuf=/.../SCRIPT
 				bcs .9
+
 				>STYA ZPPtr4			save PTR to Code Segment
 			
 				phy
@@ -386,21 +391,19 @@ PS.LoadGetHeader
 				>PUSHBI S.FI.T.TXT
 				>PUSHBI	O.RDONLY
 				>LDYAI K.IOBuf
-				ldx #SYS.fopen
-				jsr K.SYSCALL2
+				>SYSCALL2 fopen
 				bcs .9
+
 				sta .1+1
 
 				>PUSHWI 128
 				>PUSHWI K.IOBuf+128
 .1				lda #$ff				SELF MODIFIED
-				ldx #SYS.fread
-				jsr K.SYSCALL2
+				>SYSCALL2 fread
 				php
 				pha
 				lda .1+1
-				ldx #SYS.fclose
-				jsr K.SYSCALL2
+				>SYSCALL2 fclose
 				pla
 				plp
 .9				rts
diff --git a/SYS/KERNEL.S.STAT.txt b/SYS/KERNEL.S.STAT.txt
index e0d6a43d..b70d4a49 100644
--- a/SYS/KERNEL.S.STAT.txt
+++ b/SYS/KERNEL.S.STAT.txt
@@ -300,22 +300,21 @@ SHARED.Stat.I	jsr SHARED.ClrStat
 				dex
 				bne .3
 				
-*				>PUSHWI K.S.STAT+S.STAT.CTIME
-*				>LDYAI K.MLI.PARAMS+S.FI.CDATE
-*			>DEBUG
-*				>SYSCALL2 PTime2Time	BANK2
+				>PUSHWI K.S.STAT+S.STAT.CTIME
+				>LDYAI K.MLI.PARAMS+S.FI.CDATE
+				>SYSCALL2 PTime2Time	BANK2
 
-*				>PUSHWI K.S.STAT+S.STAT.MTIME
-*				>LDYAI K.MLI.PARAMS+S.FI.MDATE
-*				>SYSCALL2 PTime2Time	BANK2
+				>PUSHWI K.S.STAT+S.STAT.MTIME
+				>LDYAI K.MLI.PARAMS+S.FI.MDATE
+				>SYSCALL2 PTime2Time	BANK2
 
 				clc
 				rts
 *--------------------------------------
 SHARED.DirEnt2Stat
 				
-				clc
-				rts
+*				clc
+*				rts
 *--------------------------------------
 SHARED.ClrStat	ldx #S.STAT-1
 
diff --git a/SYS/KERNEL.S.TIME.txt b/SYS/KERNEL.S.TIME.txt
index 4725370e..0e335f04 100644
--- a/SYS/KERNEL.S.TIME.txt
+++ b/SYS/KERNEL.S.TIME.txt
@@ -90,6 +90,8 @@ K.ComputeWDAY	lda #DAY0-1				Thursday : 4 (-1 for mod 7)
 				sta ACC32
 				lda #YEAR0
 				sta ACC32+1
+			clc
+			rts
 
 .1				ldy ACC32
 				lda ACC32+1
diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt
index 967ad541..692bf385 100644
--- a/SYS/KERNEL.S.txt
+++ b/SYS/KERNEL.S.txt
@@ -69,7 +69,6 @@ A2osX.D1		.DA #0
 				.INB USR/SRC/SYS/KERNEL.S.STDLIB
 				.INB USR/SRC/SYS/KERNEL.S.DEV
 				.INB USR/SRC/SYS/KERNEL.S.FIO
-				.INB USR/SRC/SYS/KERNEL.S.PFT
 				.EP
 
 A2osX.D2		.DA #0
@@ -97,6 +96,7 @@ A2osX.E0		.DA #0
 ********* TMP ***** go to A2osX.D1
 				.INB USR/SRC/SYS/KERNEL.S.IO
 				.INB USR/SRC/SYS/KERNEL.S.PIPE
+				.INB USR/SRC/SYS/KERNEL.S.PFT
 ********* TMP ***** go to A2osX.D2
 				.INB USR/SRC/SYS/KERNEL.S.ENV
 *--------------------------------------