Kernel version 0.9 : Moving API from PSTR to CSTR

2025-02-11 00:31:06 +00:00 · 2017-08-22 08:37:03 +02:00 · 2017-08-22 08:37:03 +02:00 · 2630384de2
commit 2630384de2
parent 71a7ca455f
68 changed files with 542 additions and 557 deletions
--- a/.Floppies/A2OSX.BOOT.po
+++ b/.Floppies/A2OSX.BOOT.po
--- a/.Floppies/A2OSX.BUILD.po
+++ b/.Floppies/A2OSX.BUILD.po
--- a/.Floppies/A2OSX.DEV.po
+++ b/.Floppies/A2OSX.DEV.po
--- a/.Floppies/A2OSX.SRC.po
+++ b/.Floppies/A2OSX.SRC.po
--- a/BIN/ARP.S.txt
+++ b/BIN/ARP.S.txt
@ -99,7 +99,7 @@ CS.RUN.QUERY	jsr Init.Timeout
 				bpl .4
 				
 				>LDYA L.MSG2
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .8				lda #0
 				
@ -110,7 +110,7 @@ CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.ARP.GETCACHE
 				>STYA ZPPTR1
 				
 				>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				ldx #K.ARPCACHE.SIZE
 				
@ -138,7 +138,7 @@ CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.ARP.GETCACHE
 				
 				>LDYA L.MSG1
 				phx
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				plx
 				
 .4				lda ZPPTR1
--- a/BIN/ASM.S.FIO.txt
+++ b/BIN/ASM.S.FIO.txt
@ -58,7 +58,7 @@ FIO.OpenFileA		sta FIO.hFileName
 					
 .1					>PUSHW ZPPtr1
 					>LDYA L.MSG.SRC.FILE
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					
 					ldy #SRC.COUNT
 					lda (pData),y
@ -258,7 +258,7 @@ FIO.LOAD.ASM.T		ldy #ASM.T.hMem
 					
 .1					>PUSHW L.ASM.T.FILENAME
 					>LDYA L.MSG.T.FILE
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					
 					>PUSHWI 0				Aux type
 					>PUSHBI 6				S.FILEINFO.TYPE.BIN
--- a/BIN/ASM.S.SRC.txt
+++ b/BIN/ASM.S.SRC.txt
@ -25,7 +25,7 @@ SRC.PrintLine		ldy #ASM.MACRO.ON
 					dey
 					>PUSHB (pData),y
 					>LDYA L.MSG.SRCLINE
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 .9					rts
 *---------------------------------------
 SRC.PrintLineErr	ldx #0
--- a/BIN/ASM.S.SYM.txt
+++ b/BIN/ASM.S.SYM.txt
@ -52,7 +52,7 @@ SYM.Quit			ldy #SYM.pLastGBlock
 					rts
 *---------------------------------------
 SYM.Dump			>LDYA L.MSG.SYMBOLS
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					
 					ldy #SYM.DumpCount
 					lda #20
@ -92,7 +92,7 @@ SYM.Dump			>LDYA L.MSG.SYMBOLS
 					>PUSHA
 					
 					>LDYA L.MSG.GSYMBOL
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA

 					bcs .9
 					
@ -105,7 +105,7 @@ SYM.Dump			>LDYA L.MSG.SYMBOLS
 					pla
 					>PUSHA
 					>LDYA L.MSG.LSYMBOL
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					bcc .4
 					rts
 					
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@ -177,7 +177,7 @@ CS.INIT				>SYSCALL GetArgC
 					rts
 					
 .99					>LDYA L.MSG.HELP
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					lda #ERR.INV.ARGS
 					sec
 .9					rts
@ -206,7 +206,7 @@ CS.RUN				>SYSCALL GetC
 					inc
 					>PUSHA
 					>LDYA L.MSG.PASS
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					
 					ldy #SRC.hFILENAME
 					lda (pData),y
@ -237,7 +237,7 @@ CS.RUN				>SYSCALL GetC
 .1					jsr SYM.Dump

 					>LDYA L.MSG.SUMMARY
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					
 					lda #0				End of assembly, exit with no error
 .99					sec		
@ -259,7 +259,7 @@ CS.RUN				>SYSCALL GetC
 					>PUSHA
 					>PUSHW SRC.LINENUM
 					>LDYA L.MSG.ERROR
-					>SYSCALL CPrintFYA
+					>SYSCALL PrintFYA
 					pla
 					sec
 					rts
--- a/BIN/ATBROWSE.S.txt
+++ b/BIN/ATBROWSE.S.txt
@ -53,7 +53,7 @@ CS.RUN			stz K.MLI.PARAMS		Sync
 				
 				pha
 				>LDYA L.MSG.NOATK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				pla
 				sec
 .99				rts				
@ -61,7 +61,7 @@ CS.RUN			stz K.MLI.PARAMS		Sync
 .10				>PUSHB K.MLI.PARAMS+$E	NODE
 				>PUSHW K.MLI.PARAMS+$8	NET
 				>LDYA L.MSG.NETNODE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				stz K.MLI.PARAMS		Sync
 				lda #ATLookupName
@ -97,7 +97,7 @@ CS.RUN			stz K.MLI.PARAMS		Sync
 				beq .8
 				
 				>LDYA L.MSG.DUMP0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 .1				lda ZPPTR1
@ -117,7 +117,7 @@ CS.RUN			stz K.MLI.PARAMS		Sync
 				bpl .2
 				
 				>LDYA L.MSG.DUMP
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				lda ZPPTR2
--- a/BIN/ATLOGON.S.txt
+++ b/BIN/ATLOGON.S.txt
@ -49,7 +49,7 @@ CS.RUN			stz K.MLI.PARAMS		Sync
 				
 				pha
 				>LDYA L.MSG.NOATK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				pla
 				sec
 .99				rts				
--- a/BIN/CAT.S.txt
+++ b/BIN/CAT.S.txt
@ -70,7 +70,7 @@ CS.INIT			>SYSCALL GetArgC
 				bne .2
 				
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec
 				rts
@ -86,9 +86,10 @@ CS.INIT			>SYSCALL GetArgC
 .5				lda FileCount
 				beq .99
 				
-.8				lda (pPs)
-				ora #S.PS.F.EVENT		Now accept events
-				sta (pPs)
+.8				
+*				lda (pPs)
+*				ora #S.PS.F.EVENT		Now accept events
+*				sta (pPs)
 				
 				clc
 				rts
@ -170,42 +171,37 @@ CS.RUN.PRINT	sty	BytesRead			Y,A = Bytes read
 				clc
 				adc #1
 				sta (pData),y
-				bcc .10
 				
 				iny
 				lda (pData),y
-				inc
+				adc #0
 				sta (pData),y

-.10				lda BytesRead
-				beq .12
+				ldy #bSuppressBlankLine
+				lda (pData),y
+				bpl .10
+								
+				lda BytesRead
+				beq .12					Empty line ?
 				dec
-				bne .1					Only CR ?
+				bne .1					Only one CR ?
 				lda UsrBuf256
 				cmp #13
 				bne .1
 				
-.12				ldy #bSuppress
+.12				ldy #bPrintedBlankLine
 				lda (pData),y
-				bpl .13
+				bmi .8
 				
-				ldy #bPrintedBlankLine
-				lda (pData),y
-				bpl .11
-				clc
-				rts
-				
-.11				lda #$ff
+				lda #$ff
 				sta (pData),y
-				bne .1
-.13				clc
-				rts
+				bra .10
 				
 .1				ldy #bPrintedBlankLine
 				lda #0
 				sta (pData),y
 				
-				jsr CS.RUN.PRINTNUM
+.10				jsr CS.RUN.PRINTNUM
 				bcs .9
 				
 .20				ldx ByteIndex
@ -239,7 +235,7 @@ CS.RUN.PRINT	sty	BytesRead			Y,A = Bytes read
 				
 .3				>PUSHW ZPPtr1
 				>LDYA L.MSG.CTRLCHAR				
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				bra .7
@ -275,7 +271,7 @@ CS.RUN.PRINTNUM	clc
 				
 				>PUSHYA
 				>LDYA L.MSG.LINENUM
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 .8				rts
 *--------------------------------------
 CS.RUN.OPEN		>SYSCALL GetFullPathYA
@ -296,6 +292,7 @@ CS.RUN.OPEN		>SYSCALL GetFullPathYA
 				
 				pha

+				lda #0
 				ldy #bPrintedBlankLine	Reset this flag for the new file
 				sta (pData),y
 				
@ -310,7 +307,8 @@ CS.RUN.OPEN		>SYSCALL GetFullPathYA
 .9				sec
 				rts
 *--------------------------------------
-CS.RUN.CLOSE	ldy #hFILE
+CS.RUN.CLOSE
+CS.QUIT			ldy #hFILE
 				lda (pData),y
 				beq .8
 				
@ -326,19 +324,10 @@ CS.RUN.CLOSE	ldy #hFILE
 CS.DOEVENT		sec
 				rts
 *--------------------------------------
-CS.QUIT			ldy #hFILE
-				lda (pData),y
-				beq .8
-				
-				>SYSCALL FCloseA
-				
-.8				clc
-				rts
-*--------------------------------------
 CS.END
 *--------------------------------------
 OptionList		>PSTR "ANSans"
-OptionVars		.DA #bPrintAll,#bLineNum,#bSuppress,#bPrintAll,#bLineNum,#bSuppress
+OptionVars		.DA #bPrintAll,#bLineNum,#bSuppressBlankLine,#bPrintAll,#bLineNum,#bSuppressBlankLine
 *--------------------------------------
 MSG.USAGE		>CSTR "Usage : CAT File1 [File2...]\r\n   -A : Show All non printable caracters\r\n   -N : Number all output lines\r\n   -S : Suppress repeated empty output lines\r\n"
 MSG.LINENUM		>CSTR "%5D:"
@ -389,7 +378,7 @@ DS.START
 bPause			.BS 1
 bPrintAll		.BS 1
 bLineNum		.BS 1
-bSuppress		.BS 1
+bSuppressBlankLine	.BS 1
 ArgIndex		.BS 1
 hFILE			.BS 1
 LineNum			.BS 2
--- a/BIN/CHTYP.S.txt
+++ b/BIN/CHTYP.S.txt
@ -10,6 +10,7 @@ AUTO 6
 *--------------------------------------
 				.INB /A2OSX.BUILD/INC/MACROS.I
 				.INB /A2OSX.BUILD/INC/A2OSX.I
+				.INB /A2OSX.BUILD/INC/MLI.ERR.I
 *--------------------------------------
 X.COPY.TO.DEST	.EQ 0
 X.DELETE.SOURCE	.EQ 0
@ -80,7 +81,7 @@ CS.INIT			>SYSCALL GetArgC
 				bne .2
 				
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec
 				rts
@ -191,7 +192,7 @@ CS.RUN.FILE		jsr CS.RUN.GetFilePath
 				>PUSHWI UsrBuf256
 				
 				>LDYA L.MSG.FILE
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				ldy #HexFileType
@ -220,7 +221,7 @@ CS.RUN.FILE		jsr CS.RUN.GetFilePath
 *--------------------------------------
 CS.RUN.CheckErr	bcs .1
 				>LDYA L.MSG.OK
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				rts
 				
 .1				pha
@ -233,7 +234,7 @@ CS.RUN.CheckErr	bcs .1
 				>PUSHA
 				>LDYA L.MSG.ERR
 				
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				rts
 				
@ -349,10 +350,10 @@ CS.END
 OptionList		>PSTR "CRcr"
 OptionVars		.DA #bContinue,#bRecurse,#bContinue,#bRecurse
 *--------------------------------------
-MSG.USAGE		>PSTR "Usage : CHTYP [File *,? wildcards allowed] [File type : 0HH, SYS,TXT....]\r\n   -C : Continue on error\r\n   -R : Recurse subdirectories\r\n"
-MSG.OK			>PSTR "[Ok]\r\n"
-MSG.ERR			>PSTR "[%h]\r\n"
-MSG.FILE		>PSTR "CHTYP File:%S..."
+MSG.USAGE		>CSTR "Usage : CHTYP [File *,? wildcards allowed] [File type : 0HH, SYS,TXT....]\r\n   -C : Continue on error\r\n   -R : Recurse subdirectories\r\n"
+MSG.OK			>CSTR "[Ok]\r\n"
+MSG.ERR			>CSTR "[%h]\r\n"
+MSG.FILE		>CSTR "CHTYP File:%S..."
 STAT			.BS S.STAT
 ArgCount		.BS 1
 ArgIndex		.BS 1
--- a/BIN/CP.S.txt
+++ b/BIN/CP.S.txt
@ -27,9 +27,9 @@ MSG.USAGE		>CSTR "Usage : CP [Src File/Dir, *,? wildcards allowed]\r\n   -C : Co
 MSG.DIR			>CSTR "CP Dir :%S to %S..."
 MSG.FILE		>CSTR "CP File:%S to %S..."
 MSG.OVERWRITE	>CSTR "Overwrite %S [Yes,No,All]?"
-MSG.OK			>PSTR "[OK]\r\n"
-MSG.ERR			>PSTR "[%h]\r\n"
-MSG.DONE		>PSTR "%D File(s) Copied.\r\n"
+MSG.OK			>CSTR "[OK]\r\n"
+MSG.ERR			>CSTR "[%h]\r\n"
+MSG.DONE		>CSTR "%D File(s) Copied.\r\n"
 *--------------------------------------
 STAT			.BS S.STAT
 ArgCount		.BS 1
--- a/BIN/DEVDUMP.S.txt
+++ b/BIN/DEVDUMP.S.txt
@ -94,7 +94,7 @@ CS.DOEVENT		ldy #S.EVT.hDEV
 				>PUSHA
 				
 				>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				clc
 				rts
--- a/BIN/DNSINFO.S.txt
+++ b/BIN/DNSINFO.S.txt
@ -83,7 +83,7 @@ CS.RUN.ADD		cmp #3
 CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GETCACHE
 				>STYA ZPPTR1
 				>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #K.DNSCACHE.SIZE
 				sta EntryCount
@ -118,7 +118,7 @@ CS.RUN.DUMP		>LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GETCACHE
 				>PUSHB (ZPPTR1)				Entry Status
 				
 				>LDYA L.MSG1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .2				lda ZPPTR1
 				clc
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@ -51,11 +51,9 @@ Ctrl.A			ldy #PromptMode
 				lda (ZPPTR1)
 				beq .8
 				
-				>LDYA ZPPTR1
-				>SYSCALL PPrintFYA
-				bcs .9
-				>LDYA L.SEQ.CEOL
-				>SYSCALL CPrintFYA
+				>PUSHW ZPPTR1
+				>LDYA L.MSG.HELPLINE
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				inc .1+1
--- a/BIN/EDIT.S.SCRN.txt
+++ b/BIN/EDIT.S.SCRN.txt
@ -11,7 +11,7 @@ SCRN.Init		ldy #ScreenH
 				>PUSHA
 				>LDYA L.SEQ.INIT
 				
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				lda #12
 				>SYSCALL PutCA
@ -58,7 +58,7 @@ SCRN.UpdateTopBar
 .2				>PUSHYA

 				>LDYA L.MSG.TOPBAR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .9				rts
 *--------------------------------------
@ -99,7 +99,7 @@ SCRN.UpdateMain	ldy #ScreenY
 				bcs .9
 				
 				>LDYA L.SEQ.CEOL
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				inc TmpByte
@ -176,7 +176,7 @@ SCRN.UpdateLineAtALenY
 				bcs .9
 				
 				>LDYA L.SEQ.CEOL
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				rts
 .9				jmp Ctrl.Q				
@ -189,7 +189,7 @@ SCRN.UpdateAttrC
 				bpl .8
 				
 				>LDYA L.SEQ.NORM
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				stz bSelected
 				rts
@ -198,7 +198,7 @@ SCRN.UpdateAttrC
 				bmi .8
 				
 				>LDYA L.SEQ.INV
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				lda #$ff
 				sta bSelected
@ -215,11 +215,11 @@ SCRN.UpdateStatusBar
 				>PUSHA

 				>LDYA L.MSG.GOTOXY
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				>LDYA L.SEQ.INV
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9

 				ldy #PromptMode
@ -247,7 +247,7 @@ SCRN.UpdateStatusBar
 				>PUSHB (pData),y
 				
 				>LDYA L.MSG.STATUSBAR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				lda #58
@ -255,7 +255,7 @@ SCRN.UpdateStatusBar
 				bcs .9
 				
 				>LDYA L.SEQ.NORM
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9

 				jmp SCRN.GotoCurXCurY
@ -275,7 +275,7 @@ SCRN.UpdateStatusBar
 				tax
 				
 				>LDYA L.MSG.STATUSBAR,x
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				rts
 *--------------------------------------
@ -290,7 +290,7 @@ SCRN.UpdateStatusBarErrA
 .1				lda #$ff
 				>PUSHA
 				>LDYA L.MSG.STATUSBAR.E
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				rts
 .9				jmp Ctrl.Q				
@ -319,11 +319,11 @@ SCRN.InvLineA	sta .2+1
 				lda .2+1
 				>PUSHA
 				>LDYA L.MSG.GOTOXY
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				>LDYA L.SEQ.INV
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				ldy #ScreenW
@ -344,7 +344,7 @@ SCRN.InvLineA	sta .2+1
 .2				lda #$ff
 				>PUSHA
 				>LDYA L.MSG.GOTOXY
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .9				rts				
 *--------------------------------------
@ -365,7 +365,7 @@ GotoXY			txa
 				>PUSHA

 				>LDYA L.MSG.GOTOXY
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				rts
 .9				jmp Ctrl.Q
@ -509,7 +509,7 @@ SCRN.scrollUp	ldy #CurX
 				>PUSHA

 				>LDYA L.SEQ.SCROLLUP
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				ldy #ScreenY+1
@ -544,7 +544,7 @@ SCRN.scrollDn	ldy #CurX
 				>PUSHA

 				>LDYA L.SEQ.SCROLLDN
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9

 				ldy #ScreenY+1
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@ -58,6 +58,7 @@ L.MSG.STATUSBAR.S	.DA MSG.STATUSBAR.S
 L.MSG.STATUSBAR.E	.DA MSG.STATUSBAR.E
 L.MSG.NEWFILE	.DA MSG.NEWFILE
 L.MSG.GOTOXY	.DA MSG.GOTOXY
+L.MSG.HELPLINE	.DA MSG.HELPLINE
 L.MSG.HELP		.DA MSG.HELP
 J.PROMPT		.DA Prompt.Editor
 				.DA Prompt.Help
@ -132,7 +133,7 @@ CS.INIT			lda #$ff
 .9				rts
 *--------------------------------------
 CS.RUN			>LDYA L.SEQ.DETECT
-				>SYSCALL CPrintFYA		Send Query for term W & H
+				>SYSCALL PrintFYA		Send Query for term W & H
 				bcs .9
 				
 .1				>SYSCALL Sleep
@ -188,7 +189,7 @@ CS.QUIT			ldy #hBuffer
 				>SYSCALL FreeMemA

 .8				>LDYA L.SEQ.RESET
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 .9				rts
 *--------------------------------------
 CharIn			tax
@ -464,6 +465,7 @@ MSG.STATUSBAR.R	>CSTR "Replace:%S\e[0m"
 MSG.STATUSBAR.S	>CSTR "Save:%S\e[0m"
 MSG.STATUSBAR.E	>CSTR "Error:%h\e[0m"
 MSG.GOTOXY		>CSTR "\e[%d;%dH"
+MSG.HELPLINE	>CSTR "%S\e[K"
 MSG.HELP		>PSTR "All commands: (* = Not yet implemented)"
 				>PSTR "------------"
 				>PSTR "  Ctrl-A : This help screen"
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@ -76,7 +76,7 @@ CS.INIT			>SYSCALL GetArgC
 				bne .2

 .99				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec
 				rts
@ -163,7 +163,7 @@ CS.RUN			jsr CS.RUN.BuildCat
 				bcs .9
 				
 				>LDYA L.MSG.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0
 				sec
 				rts
@ -171,7 +171,7 @@ CS.RUN			jsr CS.RUN.BuildCat
 .9				pha
 				>PUSHA
 				>LDYA L.MSG.ERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				pla
 				sec
 				rts
@ -207,7 +207,7 @@ CS.RUN.BuildCat	ldy #hDev
 				>PUSHW ZPPtr2
 				
 				>LDYA L.MSG.INIT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				>PUSHW SizeInBlocks
--- a/BIN/IPCONFIG.S.txt
+++ b/BIN/IPCONFIG.S.txt
@ -67,7 +67,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 .9				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG
 				>STYA ZPIPCfgPtr
@ -77,7 +77,7 @@ CS.RUN			>LDYA L.MSG0
 				bne CS.RUN.DUMPDEV
 				
 				>LDYA L.MSG0.NL
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				jmp CS.RUN.DONE
 				
 CS.RUN.DUMPDEV	sta DevID
@ -90,7 +90,7 @@ CS.RUN.DUMPDEV	sta DevID
 				>STYA ZPDevStatPtr
 				
 				>LDYA L.MSG0.L
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				ldy #S.DEVSTAT.NET.MAC+5
 				
@ -119,7 +119,7 @@ CS.RUN.DUMPDEV	sta DevID
 				>PUSHB DevID
 				
 				>LDYA L.MSG1.DEV
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.DEVSTAT.NET.FLAGS
 				lda (ZPDevStatPtr),y
@ -128,7 +128,7 @@ CS.RUN.DUMPDEV	sta DevID
 				lda #1
 .2				>PUSHA		
 				>LDYA L.MSG1.DEV.ARP
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.DEVSTAT.NET.FLAGS
 				lda (ZPDevStatPtr),y
@ -137,7 +137,7 @@ CS.RUN.DUMPDEV	sta DevID
 				lda #1
 .3				>PUSHA		
 				>LDYA L.MSG1.DEV.IP
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.DEVSTAT.NET.STATUS
 				lda (ZPDevStatPtr),y
@ -145,15 +145,15 @@ CS.RUN.DUMPDEV	sta DevID
 				bne CS.RUN.LINK
 				>PUSHW L.MSG1.LINK.KO
 				>LDYA L.MSG1.LINK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bra CS.RUN.DUMPIP
 				
 CS.RUN.LINK		>PUSHW L.MSG1.LINK.OK
 				>LDYA L.MSG1.LINK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LDYA L.MSG1.LINKSPEED
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.DEVSTAT.NET.STATUS
 				lda (ZPDevStatPtr),y
@ -174,10 +174,10 @@ CS.RUN.LINK		>PUSHW L.MSG1.LINK.OK
 				>LDYA L.MSG1.DPLX.HD
 				bra .6
 .5				>LDYA L.MSG1.DPLX.FD
-.6				>SYSCALL CPrintFYA
+.6				>SYSCALL PrintFYA

 CS.RUN.DUMPIP	>LDYA L.MSG2
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda (ZPIPCfgPtr)
 				and #S.IPCFG.STATUS.OK
 				beq .11
@ -185,7 +185,7 @@ CS.RUN.DUMPIP	>LDYA L.MSG2
 				bra .10
 .11				>LDYA L.MSG2.U
 				
-.10				>SYSCALL CPrintFYA
+.10				>SYSCALL PrintFYA

 				ldy #S.IPCFG.DHCPSRVR+3
 				ldx #4
@ -194,7 +194,7 @@ CS.RUN.DUMPIP	>LDYA L.MSG2
 				dex
 				bne .2
 				>LDYA L.MSG2.DHCPSRVR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.IPCFG.IP+7				IP/MASK
 				ldx #8
@ -203,7 +203,7 @@ CS.RUN.DUMPIP	>LDYA L.MSG2
 				dex
 				bne .3
 				>LDYA L.MSG2.IP
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.IPCFG.GW+3
 				ldx #4
@ -212,7 +212,7 @@ CS.RUN.DUMPIP	>LDYA L.MSG2
 				dex
 				bne .4
 				>LDYA L.MSG2.GW
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #S.IPCFG.DNS1+7
 				ldx #8
@ -221,7 +221,7 @@ CS.RUN.DUMPIP	>LDYA L.MSG2
 				dex
 				bne .5
 				>LDYA L.MSG2.DNS
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda ZPIPCfgPtr
 				clc
@ -240,7 +240,7 @@ CS.RUN.DUMPIP	>LDYA L.MSG2
 				>PUSHYA

 				>LDYA L.MSG2.HOSTNAME
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 CS.RUN.DONE		lda #0					tell TSKMGR that all done ok, but 
 				sec						we do not want to stay in memory
--- a/BIN/LS.S.txt
+++ b/BIN/LS.S.txt
@ -200,7 +200,7 @@ CS.RUN.DEV		ldy #bLong
 				
 				>PUSHW ZPFileName
 				>LDYA L.MSG.DEVEXT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9

 				ldy #bRecurse
@ -232,7 +232,7 @@ CS.RUN.DIR		ldy #bAllmostAll

 				>PUSHW ZPFileName
 				>LDYA L.MSG.DIR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				lda #80/MAX.COL-2
@ -264,7 +264,7 @@ CS.RUN.DIR		ldy #bAllmostAll
 				
 				>PUSHW ZPFileName
 				>LDYA L.MSG.DIREXT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 .5				ldy #bRecurse
@ -295,7 +295,7 @@ CS.RUN.FILE		ldy #bLong
 				
 				>PUSHW ZPFileName
 				>LDYA L.MSG.FILE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				jsr CS.RUN.UpdateColCnt
@ -334,7 +334,7 @@ CS.RUN.FILE		ldy #bLong
 				
 				>PUSHW ZPFileName
 				>LDYA L.MSG.FILEEXT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				jsr GetNextEntry
@ -363,7 +363,7 @@ CS.RUN.PUSHEXTRA
 				lda ZPFileStat+1
 				adc #0
 				>PUSHYA
-				>SYSCALL PStrFTime
+				>SYSCALL StrFTime
 				
 .1				ldy #S.STAT.CTIME+S.TIME.MONTH
 				lda (ZPFileStat),y
@ -378,7 +378,7 @@ CS.RUN.PUSHEXTRA
 				lda ZPFileStat+1
 				adc #0
 				>PUSHYA
-				>SYSCALL PStrFTime
+				>SYSCALL StrFTime
 				
 .2				>PUSHW L.TIME.Mod		ModTime
 				>PUSHW L.TIME.Create	Create Time
@ -415,7 +415,7 @@ CS.RUN.ENTER.MSG
 				>SYSCALL GetMemPtrA
 				>PUSHYA
 				>LDYA L.MSG.ENTER
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 CS.DOEVENT		sec
@ -475,9 +475,9 @@ OptionVars		.DA #bAllmostAll,#bLong,#bRecurse,#bAllmostAll,#bLong,#bRecurse
 MSG.DEVEXT		>CSTR "%15S S%d,D%d Blocks Used:%5D,Total:%5D\r\n"
 MSG.DIR			>CSTR "%S/"
 MSG.ENTER		>CSTR "Directory:%S\r\n"
-MSG.DIREXT		>CSTR "%16S  <dir>   %a            %S %S\r\n"
+MSG.DIREXT		>CSTR "%16S  <dir>   %a            %s %s\r\n"
 MSG.FILE		>CSTR "%19S"
-MSG.FILEEXT		>CSTR "%15S %S $%H %a %10u %S %S\r\n"
+MSG.FILEEXT		>CSTR "%15S %S $%H %a %10u %s %s\r\n"
 *--------------------------------------
 PRODOS.FT.HEX	.HS 0406FAFCFDE2FF
 PRODOS.FT.TXT	>PSTR "TXT"
@ -488,8 +488,8 @@ PRODOS.FT.TXT	>PSTR "TXT"
 				>PSTR "ATK"
 				>PSTR "SYS"
 PRODOS.FT.DFLT	>PSTR "$  "
-TIME.NODATE		>PSTR "   <No-Date>   "
-TIME.Format		>PSTR "%d-%b-%y %H:%M"
+TIME.NODATE		>CSTR "   <No-Date>   "
+TIME.Format		>CSTR "%d-%b-%y %H:%M"
 TIME.Create		.BS 20
 TIME.Mod		.BS 20
 HEXDIGIT		.AS '0123456789ABCDEF'
--- a/BIN/LSDEV.S.txt
+++ b/BIN/LSDEV.S.txt
@ -44,7 +44,7 @@ CS.INIT			clc
 				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				stz DEV.ID
 				
@ -112,7 +112,7 @@ DumpHeader		ldy #S.DEV.DRV.JMP+1
 				>PUSHB DEV.ID
 				
 				>LDYA L.MSG1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 DumpStatus		bit DEV.S
@ -155,7 +155,7 @@ DumpStatus		bit DEV.S
 				bra .3
 .2				>LDYA L.MSG2.C
 				
-.3				>SYSCALL CPrintFYA
+.3				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 CS.EVENT		sec
--- a/BIN/MEM.S.txt
+++ b/BIN/MEM.S.txt
@ -50,7 +50,7 @@ CS.RUN			>LDYA L.MemStat
 				>SYSCALL GetMemStatYA

 				>LDYA L.MSG.Main
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda MemStat+S.MEMSTAT.MF
 				sec
@ -65,10 +65,10 @@ CS.RUN			>LDYA L.MemStat
 				>PUSHW MemStat+S.MEMSTAT.ML
 				
 				>LDYA L.MSG.Stat
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 *--------------------------------------
 				>LDYA L.MSG.Aux
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda MemStat+S.MEMSTAT.XF
 				sec
@ -83,10 +83,10 @@ CS.RUN			>LDYA L.MemStat
 				>PUSHW MemStat+S.MEMSTAT.XL
 				
 				>LDYA L.MSG.Stat
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 *--------------------------------------
 				>LDYA L.MSG.Kernel
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda MemStat+S.MEMSTAT.DH
 				sec
@ -101,10 +101,10 @@ CS.RUN			>LDYA L.MemStat
 				>PUSHW MemStat+S.MEMSTAT.DL
 				
 				>LDYA L.MSG.Stat
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LDYA L.MSG.End
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0
 				sec
 				rts
--- a/BIN/MEMDUMP.S.txt
+++ b/BIN/MEMDUMP.S.txt
@ -91,7 +91,7 @@ CS.RUN			>SYSCALL GetC
 				bne .1
 				
 				>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .1				ldy #MEM.COUNT
 				lda (pData),y
@ -141,19 +141,19 @@ CS.RUN			>SYSCALL GetC
 				ldy #USED.COUNT
 				>PUSHB (pData),y
 				>LDYA L.MSG2
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				>PUSHW MemMgr.HiMem
 				>LDYA L.MSG3
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				>PUSHW MemMgr.Free
 				>LDYA L.MSG4
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				>PUSHW MemMgr.LoMem
 				>LDYA L.MSG5
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda MemMgr.Free
 				sec
@ -164,7 +164,7 @@ CS.RUN			>SYSCALL GetC
 				
 				>PUSHYA
 				>LDYA L.MSG6
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				sec				
 				rts
 *--------------------------------------
@ -200,7 +200,7 @@ CS.RUN.PRINTMEM	ldy #S.MEM.LEN
 				>PUSHA
 				
 				>LDYA L.MSG1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 	
 				lda (ZPPTR1)			Free ? assume raw data...
 				bpl .10
@ -228,7 +228,7 @@ CS.RUN.PRINTMEM	ldy #S.MEM.LEN
 				>PUSHW ZPPTR2			String
 				>PUSHB (ZPPTR2)			Len
 				>LDYA L.MSG1.STR
-				>SYSCALL CPrintFYA				
+				>SYSCALL PrintFYA				
 				bra .8

 .2				ldy #15
@ -238,14 +238,14 @@ CS.RUN.PRINTMEM	ldy #S.MEM.LEN
 				bpl .3
 				
 				>LDYA L.MSG1.HEX
-				>SYSCALL CPrintFYA				
+				>SYSCALL PrintFYA				
 				
 				bra .8
 ****** BIN				
 .7				>SYSCALL GetMemPtrA
 				>PUSHYA
 				>LDYA L.MSG1.BIN
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .8				ldy #LINE.COUNT
 				lda (pData),y
--- a/BIN/MV.S.txt
+++ b/BIN/MV.S.txt
@ -27,9 +27,9 @@ MSG.USAGE		>CSTR "Usage : MV [Src File/Dir, *,? wildcards allowed]\r\n   -C : Co
 MSG.DIR			>CSTR "MV Dir :%S to %S..."
 MSG.FILE		>CSTR "MV File:%S to %S..."
 MSG.OVERWRITE	>CSTR "Overwrite %S [Yes,No,All]?"
-MSG.OK			>PSTR "[OK]\r\n"
-MSG.ERR			>PSTR "[%h]\r\n"
-MSG.DONE		>PSTR "%D File(s) Moved.\r\n"
+MSG.OK			>CSTR "[OK]\r\n"
+MSG.ERR			>CSTR "[%h]\r\n"
+MSG.DONE		>CSTR "%D File(s) Moved.\r\n"
 *--------------------------------------
 STAT			.BS S.STAT
 ArgCount		.BS 1
--- a/BIN/NETSTAT.S.txt
+++ b/BIN/NETSTAT.S.txt
@ -61,7 +61,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 .9				rts
 *--------------------------------------
 CS.RUN			>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.GETTABLE
 				>STYA ZPPTR1
@ -100,7 +100,7 @@ CS.RUN			>LDYA L.MSG0
 				>PUSHB L.MSG1+1,x
 				>PUSHB L.MSG1,x
 				>LDYA L.MSG1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .7				lda ZPPTR1
 				clc
--- a/BIN/NFSMOUNT.S.txt
+++ b/BIN/NFSMOUNT.S.txt
@ -64,7 +64,7 @@ CS.INIT			>SYSCALL GetArgC
 				rts
 				
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec
 				rts
--- a/BIN/NSCUTIL.S.txt
+++ b/BIN/NSCUTIL.S.txt
@ -60,7 +60,7 @@ CS.RUN.READ		jsr NSC.Init
 				bpl .1

 				>LDYA L.MSG.READ.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda #MLI.ERR.NODEV
 				sec
@ -69,7 +69,7 @@ CS.RUN.READ		jsr NSC.Init
 .8				jsr NSC.Dump

 				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda #0					tell TSKMGR that all done ok, but 
 				sec						we do not want to stay in memory
@ -278,16 +278,16 @@ NSC.Dump		ldx #1
 				>PUSHA
 				
 				>LDYA L.MSG.READ.OK1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LDYA L.MSG.READ.OK2.24
 				bit DS1216E.DATA+4
 				bpl .3
 				>LDYA L.MSG.READ.OK2.12
-.3				>SYSCALL CPrintFYA
+.3				>SYSCALL PrintFYA
 				
 				>LDYA L.MSG.READ.OK3
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda DS1216E.DATA+2
 				jsr PrintBCD
@ -301,7 +301,7 @@ NSC.Dump		ldx #1
 				jsr PrintBCD
 				
 				>LDYA L.MSG.READ.OK4
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda DS1216E.DATA+4
 				bpl .4
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@ -67,7 +67,7 @@ CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
 				bmi CS.RUN.IPOK
 				
 				>LDYA L.MSG.IPKO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec				
 				rts
@ -95,7 +95,7 @@ CS.RUN.IPOK		>SYSCALL GetArgC
 				bra .99
 				
 .9				>LDYA L.MSG.USAGE
-.99				>SYSCALL CPrintFYA
+.99				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec				
 				rts
@ -115,7 +115,7 @@ CS.RUN.HOSTOK	lda #1
 				bpl .1
 				
 				>LDYA L.MSG.HOSTOK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 		
 CS.RUN.OPENSKT	ldx #3
 				ldy #S.IPCFG.IP+3
@ -140,7 +140,7 @@ CS.RUN.OPENSKT	ldx #3
 				bcc .2
 				
 				>LDYA L.MSG.SKTKO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec				
 				rts
@ -246,7 +246,7 @@ CS.Print.UNREACH
 				dey
 				>PUSHB (pData),y			DST.IP
 				>LDYA L.MSG.UNREACH
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 CS.Print.REPLY	lda #TIMEOUT.MAX
@ -288,7 +288,7 @@ CS.Print.REPLY	lda #TIMEOUT.MAX
 				>PUSHB (ZPFrameBase),y
 				
 				>LDYA L.MSG.REPLY
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 CS.QUIT			ldy #hFrame
--- a/BIN/PS.S.txt
+++ b/BIN/PS.S.txt
@ -45,7 +45,7 @@ CS.RUN			>LDYAI TSKMGR.TABLE+S.PS
 				stz PS.COUNT

 				>LDYA L.MSG0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .1				lda (ZPPTR1)
 				bpl .4
@ -66,7 +66,7 @@ CS.RUN			>LDYAI TSKMGR.TABLE+S.PS
 				lda (ZPPTR1),y
 				>PUSHA					PID
 				>LDYA L.MSG1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .4				lda ZPPTR1
 				clc
--- a/BIN/RM.S.txt
+++ b/BIN/RM.S.txt
@ -26,9 +26,9 @@ OptionVars		.DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#b
 MSG.USAGE		>CSTR "Usage : RM [File/Dir, *,? wildcards allowed]\r\n   -C : Continue on error\r\n   -Q : Quiet\r\n   -R : Recurse subdirectories\r\n"
 MSG.DIR			>CSTR "RM Dir :%S..."
 MSG.FILE		>CSTR "RM File:%S..."
-MSG.OK			>PSTR "[OK]\r\n"
-MSG.ERR			>PSTR "[%h]\r\n"
-MSG.DONE		>PSTR "%D File(s) Removed.\r\n"
+MSG.OK			>CSTR "[OK]\r\n"
+MSG.ERR			>CSTR "[%h]\r\n"
+MSG.DONE		>CSTR "%D File(s) Removed.\r\n"
 *--------------------------------------
 STAT			.BS S.STAT
 ArgCount		.BS 1
--- a/BIN/RPCDUMP.S.txt
+++ b/BIN/RPCDUMP.S.txt
@ -74,7 +74,7 @@ CS.INIT			>SYSCALL GetArgC
 				rts
 				
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec
 				rts
@ -96,7 +96,7 @@ CS.RUN			jsr Init.Timeout
 				>SYSCALL GetArgA
 				>PUSHYA
 				>LDYA L.MSG.UNKNOWN
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				sec
 				rts
 				
@ -158,7 +158,7 @@ CS.RUN			jsr Init.Timeout
 				>SYSCALL GetArgA
 				>PUSHYA
 				>LDYA L.MSG.TIMEOUT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				sec
 				rts
 *--------------------------------------
@ -207,7 +207,7 @@ DumpRPCFrame	lda #S.UDP+24
 				sta ZPFrameBase+1

 				>LDYA L.MSG.DUMP0
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .1				ldy #3
 				lda (ZPFrameBase),y		Value follows?
@ -231,7 +231,7 @@ DumpRPCFrame	lda #S.UDP+24
 				bne .7

 				>LDYA L.MSG.DUMP1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda #20
 				clc
--- a/BIN/X.CPMVRM.S.txt
+++ b/BIN/X.CPMVRM.S.txt
@ -77,7 +77,7 @@ CS.INIT			>SYSCALL GetArgC
 				bne .2

 .99				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec
 				rts
@ -321,7 +321,7 @@ CS.RUN.LEAVE 	jsr LeaveSubDir			exit this sub dir....
 				dey
 				>PUSHB (pData),y
 				>LDYA L.MSG.DONE
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 .91				ldy #RC
 				lda (pData),y			get global RC in case of bContinue
@ -506,7 +506,7 @@ CS.RUN.FILE.MSG clc
 				>LDYA L.MSG.DIR
 				bcs .2
 .1				>LDYA L.MSG.FILE				
-.2				>SYSCALL CPrintFYA
+.2				>SYSCALL PrintFYA
 				rts
 				
 .8				clc
@ -524,7 +524,7 @@ CS.RUN.OVERWRITE.MSG
 				jsr CS.RUN.GetPathY
 				>PUSHYA
 				>LDYA L.MSG.OVERWRITE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				rts
 				
 CS.RUN.OVERWRITE.KEY
@ -688,7 +688,7 @@ CS.RUN.CheckErr	bcs .1
 				bmi .8
 				
 				>LDYA L.MSG.OK
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				rts
 				
 .1				ldy #RC
@ -703,7 +703,7 @@ CS.RUN.CheckErr	bcs .1
 				>PUSHA
 				>LDYA L.MSG.ERR
 				
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				rts
 				
--- a/DRV/CONSOLE.DRV.S.txt
+++ b/DRV/CONSOLE.DRV.S.txt
@ -38,7 +38,7 @@ L.MSG.DETECT	.DA MSG.DETECT
 				.DA 0					End Of Reloc Table
 *--------------------------------------
 Dev.Detect		>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				clc
 				rts
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@ -37,7 +37,7 @@ L.MSG.DETECT	.DA MSG.DETECT
 				.DA 0					End Of Reloc Table
 *--------------------------------------
 Dev.Detect		>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldx #0
 .1				txa
--- a/DRV/LANCEGS.DRV.S.txt
+++ b/DRV/LANCEGS.DRV.S.txt
@ -41,7 +41,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 *--------------------------------------
 Dev.Detect		>STYA Args
 				>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldx #$70
 				ldy #7
@ -62,7 +62,7 @@ Dev.Detect		>STYA Args
 				bne .1
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV
 				sec
@ -89,7 +89,7 @@ Dev.Detect		>STYA Args
 				
 .4				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@ -74,7 +74,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 				.DA 0					End Of Reloc Table
 *--------------------------------------
 Dev.Detect		>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				stz ZPTmpPtr1
 				lda #$C1
@ -96,7 +96,7 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				bne .1	
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV
 				sec
@ -116,7 +116,7 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				
 				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
--- a/DRV/PIC.DRV.S.txt
+++ b/DRV/PIC.DRV.S.txt
@ -36,7 +36,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 *--------------------------------------
 Dev.Detect		>STYA ARGS
 				>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				stz ZPTmpPtr1
 				lda #$C1
@ -63,7 +63,7 @@ Dev.Detect		>STYA ARGS
 				bne .1	
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV		Not Found in any slot, exiting
 				sec
@ -86,7 +86,7 @@ Dev.Detect		>STYA ARGS

 				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
--- a/DRV/SSC.DRV.S.txt
+++ b/DRV/SSC.DRV.S.txt
@ -38,7 +38,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 Dev.Detect		>STYA ARGS

 				>LDYA L.MSG.DETECT
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				stz ZPTmpPtr1
 				lda #$C1
@ -65,7 +65,7 @@ Dev.Detect		>STYA ARGS
 				bne .1	
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV		Not Found in any slot, exiting
 				sec
@ -88,7 +88,7 @@ Dev.Detect		>STYA ARGS

 				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
@ -96,9 +96,9 @@ CS.END
 DEVSIG.Offset	.HS 05070B0C
 DEVSIG.Value	.HS 38180131
 DEVSIG.Length	.EQ DEVSIG.Value-DEVSIG.Offset
-MSG.DETECT		>PSTR "Apple SSC (Super Serial Card,//c Serial Port) Driver.\r\n"
-MSG.DETECT.OK	>PSTR "SSC Installed As Device : %S\r\n"
-MSG.DETECT.KO	>PSTR "No SSC Found.\r\n"
+MSG.DETECT		>CSTR "Apple SSC (Super Serial Card,//c Serial Port) Driver.\r\n"
+MSG.DETECT.OK	>CSTR "SSC Installed As Device : %S\r\n"
+MSG.DETECT.KO	>CSTR "No SSC Found.\r\n"
 ARGS			.BS 2
 *--------------------------------------
 *			Device Header (16 Bytes)
--- a/DRV/SSC.I.DRV.S.txt
+++ b/DRV/SSC.I.DRV.S.txt
@ -41,7 +41,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 Dev.Detect		>STYA ARGS

 				>LDYA L.MSG.DETECT
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				stz ZPTmpPtr1
 				lda #$C1
@ -68,7 +68,7 @@ Dev.Detect		>STYA ARGS
 				bne .1	
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV		Not Found in any slot, exiting
 				sec
@ -91,7 +91,7 @@ Dev.Detect		>STYA ARGS

 				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
@ -99,9 +99,9 @@ CS.END
 DEVSIG.Offset	.HS 05070B0C
 DEVSIG.Value	.HS 38180131
 DEVSIG.Length	.EQ DEVSIG.Value-DEVSIG.Offset
-MSG.DETECT		>PSTR "Apple SSC (Super Serial Card,//c Serial Port) Driver (IRQ Enabled).\r\n"
-MSG.DETECT.OK	>PSTR "SSC Installed As Device : %S\r\n"
-MSG.DETECT.KO	>PSTR "No SSC Found.\r\n"
+MSG.DETECT		>CSTR "Apple SSC (Super Serial Card,//c Serial Port) Driver (IRQ Enabled).\r\n"
+MSG.DETECT.OK	>CSTR "SSC Installed As Device : %S\r\n"
+MSG.DETECT.KO	>CSTR "No SSC Found.\r\n"
 ARGS			.BS 2
 *--------------------------------------
 *			Device Header (16 Bytes)
--- a/DRV/UTHER2.AI.DRV.S.txt
+++ b/DRV/UTHER2.AI.DRV.S.txt
@ -43,7 +43,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 *--------------------------------------
 Dev.Detect		>STYA Args
 				>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldx #$70+$88
 				ldy #7
@ -87,7 +87,7 @@ Dev.Detect		>STYA Args
 				bne .1
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV
 				sec
@ -125,7 +125,7 @@ Dev.Detect		>STYA Args
 				
 .8				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
--- a/DRV/UTHERNET.DRV.S.txt
+++ b/DRV/UTHERNET.DRV.S.txt
@ -41,7 +41,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 *--------------------------------------
 Dev.Detect		>STYA ARGS
 				>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldx #$70
 				ldy #7
@ -71,7 +71,7 @@ Dev.Detect		>STYA ARGS
 				bne .1
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV
 				sec
@ -119,7 +119,7 @@ Dev.Detect		>STYA ARGS
 				
 .8				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
--- a/DRV/UTHERNET2.DRV.S.txt
+++ b/DRV/UTHERNET2.DRV.S.txt
@ -42,7 +42,7 @@ L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
 *--------------------------------------
 Dev.Detect		>STYA Args
 				>LDYA L.MSG.DETECT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldx #$70+$88
 				ldy #7
@ -86,7 +86,7 @@ Dev.Detect		>STYA Args
 				bne .1
 				
 				>LDYA L.MSG.DETECT.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				lda #MLI.ERR.NODEV
 				sec
@ -124,7 +124,7 @@ Dev.Detect		>STYA Args
 				
 .8				>PUSHW L.DEV.HEADER.NAME
 				>LDYA L.MSG.DETECT.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				clc
 				rts
 *--------------------------------------
--- a/INC/A2osX.I.txt
+++ b/INC/A2osX.I.txt
@ -207,10 +207,10 @@ SYS.MKDirYA			.EQ $3E
 *--------------------------------------
 *					.EQ $40
 SYS.SScanF			.EQ $42
-SYS.PPrintFYA		.EQ $44
-SYS.CPrintFYA		.EQ $46
-*					.EQ $48
-*					.EQ $4A
+*					.EQ $44
+SYS.PrintFYA		.EQ $46
+SYS.SPrintFYA		.EQ $48
+SYS.FPrintFYA		.EQ $4A
 SYS.AToI			.EQ $4C
 *					.EQ $4E
 *--------------------------------------
@ -220,7 +220,7 @@ SYS.PStrCat			.EQ $54
 SYS.PStrMatch 		.EQ $56
 SYS.PStrUprYA 		.EQ $58
 SYS.PStrLwrYA 		.EQ $5A
-SYS.PStrFTime		.EQ $5C
+SYS.StrFTime		.EQ $5C
 SYS.PStr2StrArrayYA	.EQ $5E
 *--------------------------------------
 SYS.ExecProcessNewEnvYA	.EQ $60
@ -464,9 +464,6 @@ S.EVT.F.T1SEC	.EQ %01000000
 S.EVT.F.hMEM2	.EQ %00100000			Indicates That S.EVT.DATAHI is a hMem
 S.EVT.F.hMEM1	.EQ %00010000			Indicates That S.EVT.DATALO is a hMem

-S.EVT.F.NET		.EQ %00000100
-S.EVT.F.MOUSE	.EQ %00000010
-S.EVT.F.KEY 	.EQ %00000001
 S.EVT.hDEV		.EQ 1
 S.EVT.DATA		.EQ 2
 S.EVT.DATALO	.EQ 2
@ -530,12 +527,12 @@ S.STAT.CTIME		.EQ 38				S.TIME
 S.STAT.BLOCKS		.EQ 46				DWORD
 S.STAT.BLKSIZE		.EQ 50				WORD
 S.STAT.P.TYPE		.EQ 52				BYTE
-S.STAT.P.AUXTYPE 	.EQ 53			WORD
+S.STAT.P.AUXTYPE 	.EQ 53				WORD
 S.STAT.P.SLOT		.EQ 55				BYTE
 S.STAT.P.DRIVE		.EQ 56				BYTE
-S.STAT.P.DEVSTATUS	.EQ 57			BYTE
-*S.STAT.P.DEVCNFLCT	.EQ 58			BYTE
-S.STAT.P.DEVBLOCKS	.EQ 59			BYTE
+S.STAT.P.DEVSTATUS	.EQ 57				BYTE
+*S.STAT.P.DEVCNFLCT	.EQ 58				BYTE
+S.STAT.P.DEVBLOCKS	.EQ 59				BYTE
 *
 S.STAT				.EQ 64
 *--------------------------------------
--- a/SBIN/DESKTOP.S.txt
+++ b/SBIN/DESKTOP.S.txt
@ -49,7 +49,7 @@ L.DrawLine6.CB	.DA DrawLine6.CB
 				.DA 0
 *--------------------------------------
 CS.INIT			>LDYA L.MSG.INIT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				>LDYA L.LIBGFX
 				>SYSCALL LoadLibYA
--- a/SBIN/DHCPCLNT.S.txt
+++ b/SBIN/DHCPCLNT.S.txt
@ -99,7 +99,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 .98				>LDYA L.MSG.CFG.ND
 				bra .90
 .99				>LDYA L.MSG.CFG.NA
-.90				>SYSCALL CPrintFYA
+.90				>SYSCALL PrintFYA
 				lda #0
 				sec
 				rts
@ -115,7 +115,7 @@ CS.RUN			>PUSHW L.Socket
 				sta (pData),y
 				
 				>LDYA L.MSG.CFG1
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				jsr Init.Timeout
 				
@ -154,7 +154,7 @@ CS.RUN.SREQ		ldx #3
 				bpl .1
 				
 				>LDYA L.MSG.CFG2
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				ldy #hSocket
 				>PUSHB (pData),y
@ -197,7 +197,7 @@ CS.RUN.OK		lda #S.IPCFG.STATUS.OK
 				bpl .2
 				
 				>LDYA L.MSG.CFG.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0					Leave with NO ERROR
 				sec
 				rts
@ -205,7 +205,7 @@ CS.RUN.OK		lda #S.IPCFG.STATUS.OK
 CS.RUN.KO		pha
 				>PUSHA
 				>LDYA L.MSG.CFG.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				pla
 				sec
 				rts
--- a/SBIN/GETTY.S.txt
+++ b/SBIN/GETTY.S.txt
@ -45,7 +45,7 @@ CS.INIT			>SYSCALL GetArgC
 				bne .1
 				
 				>LDYA L.MSG.USAGE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0
 				sec
 				rts
@ -188,11 +188,11 @@ CS.RUN			jsr Init.Timeout
 .5				

 				>LDYA L.MSG.TELNET.OPT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs *

 				>LDYA L.MSG.GREETINGS
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				bcs .8					unable to send greetings...loop..
 				
--- a/SBIN/HTTPD.S.txt
+++ b/SBIN/HTTPD.S.txt
@ -60,7 +60,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 CS.RUN			jsr Init.Timeout

 				>LDYA L.MSG.TCPWAIT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .1				>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
 				bcs .99
@ -79,7 +79,7 @@ CS.RUN			jsr Init.Timeout
 				jmp CS.RUN.ABORT
 				
 .99				>LDYA L.MSG.TCPIPERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec	
 				rts
@ -100,7 +100,7 @@ CS.RUN.INIT		ldx #3
 				sta (pData),y
 				
 				>LDYA L.MSG.INITOK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .2				>SYSCALL Sleep
 				jsr CS.RUN.SERVER
@ -127,13 +127,13 @@ CS.RUN.INIT		ldx #3
 				bra .2
 				
 .9				>LDYA L.MSG.SKTERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec	
 				rts
 				
 CS.RUN.ABORT	>LDYA L.MSG.ABORT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0
 				
 CS.RUN.ERR		sec	
@ -178,7 +178,7 @@ CS.RUN.SERVER	ldy #hSrvSocket
 				>PUSHA
 				
 				>LDYA L.MSG.INCOMING
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 .8				clc
 .9				rts
 *--------------------------------------
@ -190,7 +190,7 @@ CS.RUN.CLIENT	sta hClntSocket
 				bcs .1
 				
 				>LDYAI UsrBuf256
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>PUSHB hClntSocket
 				>PUSHW L.HTTP.200OK
--- a/SBIN/INSDRV.S.txt
+++ b/SBIN/INSDRV.S.txt
@ -42,7 +42,7 @@ CS.INIT			>SYSCALL GetArgC
 				bne .1
 				
 				>LDYA L.MSG.HELP
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0					tell TSKMGR that all done ok, but
 				sec						we do not want to stay in memory
 				rts
@ -52,7 +52,7 @@ CS.INIT			>SYSCALL GetArgC
 				>PUSHYA

 				>LDYA L.MSG.LOAD
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				lda #1					get PTR to ARG[1] (Driver name)
 				>SYSCALL GetArgA
--- a/SBIN/KCONFIG.S.txt
+++ b/SBIN/KCONFIG.S.txt
@ -70,7 +70,7 @@ CS.RUN			>LDYA L.FILENAME
 				sta (pData),y
 				
 				>LDYA L.MSG.TOPBAR
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				jsr CS.RUN.Load
 				bcs .1
@ -78,19 +78,19 @@ CS.RUN			>LDYA L.FILENAME
 				bra .2
 .1				>LDYA L.MSG.TOPBAR.KO

-.2				>SYSCALL PPrintFYA
+.2				>SYSCALL PrintFYA
 				
 				>LDYA L.MSG.KCONF
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LDYAI A2osX.HZ
 				jsr CS.RUN.DumpConfYA

 				>LDYA L.MSG.STATUSBAR
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA

 CS.RUN.REPaint	>LDYA L.MSG.FCONF
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #hFileBuf
 				lda (pData),y
@ -134,7 +134,7 @@ CS.RUN.Loop		>SYSCALL Sleep
 				bra CS.RUN.REPaint
 				
 .8				>LDYA L.MSG.QUIT
-.9				>SYSCALL PPrintFYA
+.9				>SYSCALL PrintFYA
 				lda #0
 				sec
 				rts
@ -258,7 +258,7 @@ CS.RUN.DumpConfYA
 				>PUSHB (ZPTmp1)
 				
 				>LDYA L.MSG.HZ
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA

 				ldy #8
 				lda (ZPTmp1),y
@ -268,7 +268,7 @@ CS.RUN.DumpConfYA
 .10				>PUSHW L.MSG.ENABLED				
 				
 .12				>LDYA L.MSG.CHROOT
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldy #9					Slot 1
 				
@ -297,7 +297,7 @@ CS.RUN.DumpConfYA
 				>PUSHA					Slot
 				
 				>LDYA L.MSG.SLOT
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 			
 				ply
 				iny
@ -305,7 +305,7 @@ CS.RUN.DumpConfYA
 				bne .1
 				
 				>LDYA L.MSG.PROMPT
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA

 				clc
 				rts
@ -341,31 +341,31 @@ SLOTS			.DA #0
 SLOTS.MAX		.EQ *-SLOTS
 *--------------------------------------
 FILENAME		>PSTR "${A2OSX}A2osX.KCONFIG"
-MSG.TOPBAR		>PSTR "\ec\e[7m\e[1;1HA2osX Kernel Config Utility : "
-MSG.TOPBAR.OK	>PSTR "KCONFIG File Successfully Loaded.                 \e[0m"
-MSG.TOPBAR.KO	>PSTR "Invalid/missing KCONFIG File.                     \e[0m"
-MSG.STATUSBAR	>PSTR "\e[7m\e[24;1HCtrl-Q:Quit,Ctrl-S:Save,Ctrl-T:Toggle Time,Ctrl-C:Toggle CHRoot,1-7:En/Dis Slot \e[0m"
-MSG.KCONF		>PSTR "\e[2;1H------ Actual Kernel Configuration ------\r\n"
-MSG.FCONF		>PSTR "\e[13;1H------ KCONFIG File Configuration ------\r\n"
-MSG.HZ			>PSTR " Machine Timing  : %d0 Hz\r\n"	
-MSG.CHROOT		>PSTR " CHRoot to /RAMx : %S\r\n"	
-MSG.ENABLED		>PSTR "Enabled "	
-MSG.DISABLED	>PSTR "Disabled"	
-MSG.SLOT		>PSTR " Slot #%d : %S\r\n"
-MSG.SLOT.NODEV	>PSTR "<ENABLED> "
-MSG.SLOT.Z80	>PSTR "Z80 CPU Board"
-MSG.SLOT.VSD	>PSTR "SSC Shared Driver for VSDRIVE"
-MSG.SLOT.ATK	>PSTR "AppleTalk Board"
-MSG.SLOT.DII	>PSTR "Disk II Controller"
-MSG.SLOT.BLK	>PSTR "Generic Block/SCSI Controller"
-MSG.SLOT.PRT	>PSTR "SmartPort Controller"
-MSG.SLOT.COM	>PSTR "Communication Card"
-MSG.SLOT.XY		>PSTR "XY Pointing Device"
-MSG.SLOT.NET	>PSTR "Network Interface Card"
-MSG.SLOT.DIS	>PSTR "<DISABLED>"
-MSG.PROMPT		>PSTR "\e[24;80H"
-MSG.QUIT		>PSTR "\ec"
-MSG.QUIT.ERR	>PSTR "\ecError [$%h] While Writing KCONFIG File.\r\n\r\n"
+MSG.TOPBAR		>CSTR "\ec\e[7m\e[1;1HA2osX Kernel Config Utility : "
+MSG.TOPBAR.OK	>CSTR "KCONFIG File Successfully Loaded.                 \e[0m"
+MSG.TOPBAR.KO	>CSTR "Invalid/missing KCONFIG File.                     \e[0m"
+MSG.STATUSBAR	>CSTR "\e[7m\e[24;1HCtrl-Q:Quit,Ctrl-S:Save,Ctrl-T:Toggle Time,Ctrl-C:Toggle CHRoot,1-7:En/Dis Slot \e[0m"
+MSG.KCONF		>CSTR "\e[2;1H------ Actual Kernel Configuration ------\r\n"
+MSG.FCONF		>CSTR "\e[13;1H------ KCONFIG File Configuration ------\r\n"
+MSG.HZ			>CSTR " Machine Timing  : %d0 Hz\r\n"	
+MSG.CHROOT		>CSTR " CHRoot to /RAMx : %s\r\n"	
+MSG.ENABLED		>CSTR "Enabled "	
+MSG.DISABLED	>CSTR "Disabled"	
+MSG.SLOT		>CSTR " Slot #%d : %s\r\n"
+MSG.SLOT.NODEV	>CSTR "<ENABLED> "
+MSG.SLOT.Z80	>CSTR "Z80 CPU Board"
+MSG.SLOT.VSD	>CSTR "SSC Shared Driver for VSDRIVE"
+MSG.SLOT.ATK	>CSTR "AppleTalk Board"
+MSG.SLOT.DII	>CSTR "Disk II Controller"
+MSG.SLOT.BLK	>CSTR "Generic Block/SCSI Controller"
+MSG.SLOT.PRT	>CSTR "SmartPort Controller"
+MSG.SLOT.COM	>CSTR "Communication Card"
+MSG.SLOT.XY		>CSTR "XY Pointing Device"
+MSG.SLOT.NET	>CSTR "Network Interface Card"
+MSG.SLOT.DIS	>CSTR "<DISABLED>"
+MSG.PROMPT		>CSTR "\e[24;80H"
+MSG.QUIT		>CSTR "\ec"
+MSG.QUIT.ERR	>CSTR "\ecError [$%h] While Writing KCONFIG File.\r\n\r\n"
 *--------------------------------------
 				.DUMMY
 				.OR 0
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@ -51,7 +51,7 @@ CS.RUN			lda #0
 				sta (pData),y
 				
 				>LDYA L.MSG.LOGIN
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				lda #0					Echo all caracters
@ -65,7 +65,7 @@ CS.RUN			lda #0
 				bcc .1
 				
 				>LDYA L.MSG.PASSWORD
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9
 				
 				lda #'*'
--- a/SBIN/NFSD.S.txt
+++ b/SBIN/NFSD.S.txt
@ -59,7 +59,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 CS.RUN			jsr Init.Timeout

 				>LDYA L.MSG.TCPWAIT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .1				>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
 				bcs .99
@ -73,7 +73,7 @@ CS.RUN			jsr Init.Timeout
 				bcc .1
 				
 .99				>LDYA L.MSG.TCPIPERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec	
 				rts
@ -94,7 +94,7 @@ CS.RUN.INIT		ldx #3
 				sta (pData),y
 				
 				>LDYA L.MSG.INITOK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .11				>SYSCALL Sleep
 				ldy #bCTRLC
@ -119,17 +119,17 @@ CS.RUN.INIT		ldx #3
 				bpl .2
 				
 				>LDYA L.MSG.INCOMING
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bra .11
 				
 .9				>LDYA L.MSG.SKTERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec	
 				rts
 				
 .99				>LDYA L.MSG.ABORT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0
 				sec	
 				rts
--- a/SBIN/SHELL.S.CMD.txt
+++ b/SBIN/SHELL.S.CMD.txt
@ -251,10 +251,10 @@ Cmd.Exec.CD		lda ARGS
 Cmd.Exec.PWD	ldy #S.PS.hPREFIX
 				lda (pPs),y
 				>SYSCALL GetMemPtrA
-				>SYSCALL PPrintFYA
-				bcs .9
-				jmp Cmd.Exec.ECHO.CR
-.9				rts
+				>PUSHYA
+				>LDYA L.MSG.PSTRCR
+				>SYSCALL PrintFYA
+				rts
 				
 Cmd.Exec.CD1	stz UsrBuf256
 				lda ARGS+1
@ -401,7 +401,7 @@ Cmd.Exec.SET	lda ARGS
 				>PUSHW ZPPTR1			Push name

 				>LDYA L.MSG.PRINTENV
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				bcs .9

 				lda ZPPTR2
@ -449,7 +449,7 @@ Cmd.Exec.SETVAR	tax
 				>PUSHYA					push value
 				>PUSHW L.ARGS			push name
 				>LDYA L.MSG.PRINTENV
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 .8				clc
 .9				rts
@ -472,19 +472,20 @@ Cmd.Exec.TIME	clc
 .1				>PUSHW L.FMT.TIME

 .2				>PUSHW L.TIME
-				>SYSCALL PStrFTime
+				>SYSCALL StrFTime
 				
 				>LDYAI UsrBuf256
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				bcs Cmd.Exec.ECHO.RTS
 				bra Cmd.Exec.ECHO.CR
 *--------------------------------------
 Cmd.Exec.ECHO	lda ARGS
 				beq Cmd.Exec.ECHO.CR
 				
-				>LDYA L.ARGS
-				>SYSCALL PPrintFYA
-				bcs Cmd.Exec.ECHO.RTS
+				>PUSHW L.ARGS
+				>LDYA L.MSG.PSTRCR
+				>SYSCALL PrintFYA
+				rts
 				
 Cmd.Exec.ECHO.CR
 				lda #13
--- a/SBIN/SHELL.S.CSH.txt
+++ b/SBIN/SHELL.S.CSH.txt
@ -13,7 +13,7 @@ CSH.TYPE.LONG	.EQ 3
 CSH.TYPE.FLOAT	.EQ 4
 *--------------------------------------
 CSH.Init		>LDYAI 256
-				>SYSCALL GetMemYA
+				>SYSCALL GetMem0YA
 				bcs .9
 				txa
 				ldy #CSH.hSymbols
@ -100,9 +100,9 @@ CSH.Run			jsr CSH.GetBuf
 				cmp #'='
 				bne .99
 				
-				jmp CSH.GetNextCharNB	Skip =
+				jsr CSH.GetNextCharNB	Skip =
 				bcs .99
-
+				
 				jsr CSH.ExpEval
 				bcs .9
 				
@ -151,7 +151,7 @@ CSH.Run			jsr CSH.GetBuf

 				>PUSHW pData
 				>LDYA L.MSG.ECHO
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 .80				clc
 				rts
@ -162,19 +162,16 @@ CSH.Quit		ldy #CSH.hBuf
 				>SYSCALL FreeMemA

 .1				ldy #CSH.hStack
-
 				lda (pData),y
 				beq .2
 				>SYSCALL FreeMemA
 				
 .2				ldy #CSH.hData
-
 				lda (pData),y
 				beq .3
 				>SYSCALL FreeMemA
 				
 .3				ldy #CSH.hSymbols
-
 				lda (pData),y
 				beq .8
 				>SYSCALL FreeMemA
--- a/SBIN/SHELL.S.HIS.txt
+++ b/SBIN/SHELL.S.HIS.txt
@ -14,21 +14,23 @@ HIS.Init		>LDYAI 256				Get a buffer for History
 				sta (pData),y
 				
 				lda #0
-				ldy #CmdHistory.IDX
+				ldy #HIS.BufIndex
 				sta (pData),y
-				ldy #CmdHistory.END
+				ldy #HIS.BufEnd
 				sta (pData),y
 .9				rts
 *--------------------------------------
 HIS.Add			ldy #HIS.hBuf
 				lda (pData),y
 				beq .9
+				
 				>SYSCALL GetMemPtrA
 				>STYA ZPPTR1
 				
-.10				ldy #CmdHistory.END		
+.10				ldy #HIS.BufEnd		
 				lda (pData),y
-				sec						add len+1
+				
+.11				sec						add len+1
 				adc (pData)				CmdBuffer length
 				bcc .2					enough room
 				
@ -49,27 +51,27 @@ HIS.Add			ldy #HIS.hBuf
 				
 				tya
 				
-				ldy #CmdHistory.END		mark new end of history
+				ldy #HIS.BufEnd		mark new end of history
 				sta (pData),y
-				bra .10					retry....
+				bra .11					retry....
 				
-.2				tax						keep new CmdHistory.END
+.2				tax						keep new HIS.BufEnd

 				tay
 				lda #0
 				sta (ZPPTR1),y			set ending 0

-				ldy #CmdHistory.END		save old END
+				ldy #HIS.BufEnd		save old END
 				lda (pData),y
 				pha
 				
 				txa						get back new END

-				ldy #CmdHistory.IDX		set it as new IDX
+				ldy #HIS.BufIndex		set it as new IDX
 				sta (pData),y
 			
-				ldy #CmdHistory.END
-				sta (pData),y			set new CmdHistory.END
+				ldy #HIS.BufEnd
+				sta (pData),y			set new HIS.BufEnd
 				
 				pla						get back old END
 				clc
@ -93,10 +95,10 @@ HIS.GetPrev		ldy #HIS.hBuf
 				
 				tax
 				
-				ldy #CmdHistory.END
+				ldy #HIS.BufEnd
 				lda (pData),y
 				beq HISTORY.RTS			empty history,nothing to do
-				ldy #CmdHistory.IDX
+				ldy #HIS.BufIndex
 				lda (pData),y
 				beq HISTORY.RTS			already oldest,nothing to do
 				
@ -113,12 +115,12 @@ HIS.GetPrev		ldy #HIS.hBuf
 				adc (ZPPTR1),y
 				bcs History.RTS			out of buffer
 				
-				ldy #CmdHistory.IDX
+				ldy #HIS.BufIndex
 				cmp (pData),y
 				bne .1					reached current index
 				
 .2				txa
-				ldy #CmdHistory.IDX		set new index
+				ldy #HIS.BufIndex		set new index
 				sta (pData),y
 				bra HIS.SetBuf
 History.RTS		rts
@ -129,10 +131,10 @@ HIS.GetNext		ldy #HIS.hBuf
 				
 				tax
 				
-				ldy #CmdHistory.END
+				ldy #HIS.BufEnd
 				lda (pData),y
 				beq HISTORY.RTS			empty history,nothing to do
-				ldy #CmdHistory.IDX
+				ldy #HIS.BufIndex
 				cmp (pData),y
 				beq HISTORY.RTS			already oldest,nothing to do
 				
@ -141,7 +143,7 @@ HIS.GetNext		ldy #HIS.hBuf
 				>SYSCALL GetMemPtrA
 				>STYA ZPPTR1

-				ldy #CmdHistory.IDX
+				ldy #HIS.BufIndex
 				lda (pData),y
 				phy
 				tay
@ -150,14 +152,14 @@ HIS.GetNext		ldy #HIS.hBuf
 				ply
 				sta (pData),y
 				
-				ldy #CmdHistory.END
+				ldy #HIS.BufEnd
 				cmp (pData),y
 				bne HIS.SetBuf
-				jmp CmdBuffer.CLR		end of history, just blank buffer
+				jmp CmdLine.CLR		end of history, just blank buffer
 *--------------------------------------
-HIS.SetBuf		jsr CmdBuffer.CLR
+HIS.SetBuf		jsr CmdLine.CLR

-				ldy	#CmdHistory.IDX
+				ldy	#HIS.BufIndex
 				lda (pData),y
 				tay						keep length of string
 				
@ -171,10 +173,7 @@ HIS.SetBuf		jsr CmdBuffer.CLR
 				sta (pData),y
 				dey
 				bpl .1
-				
-				>LDYA pData
-				>SYSCALL PPrintfYA
-				rts
+				jmp CmdLine.SET
 *--------------------------------------
 HIS.Quit		ldy #HIS.hBuf
 				lda (pData),y
--- a/SBIN/SHELL.S.ERR.txt
+++ b/SBIN/SHELL.S.ERR.txt
@ -5,7 +5,7 @@ INC 1
 AUTO 6
 				.LIST OFF	
 *--------------------------------------
-ERR.Print		>PUSHA					Save EC for PrintF
+IO.PrintErrMsg	>PUSHA					Save EC for PrintF

 				ldx L.ERR.Codes
 				stx ZPPTR1
@ -38,10 +38,10 @@ ERR.Print		>PUSHA					Save EC for PrintF
 				
 .8				>PUSHW ZPPTR1
 				>LDYA L.MSG.ERROR
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 MAN
-SAVE /A2OSX.SRC/SBIN/SHELL.S.ERR
+SAVE /A2OSX.SRC/SBIN/SHELL.S.IO
 LOAD /A2OSX.SRC/SBIN/SHELL.S
 ASM
--- a/SBIN/SHELL.S.txt
+++ b/SBIN/SHELL.S.txt
@ -55,6 +55,8 @@ CS.START		cld
 L.MSG.GREETINGS	.DA MSG.GREETINGS
 L.MSG.PROMPT	.DA MSG.PROMPT
 L.MSG.ECHO		.DA MSG.ECHO
+L.MSG.PSTRCR	.DA MSG.PSTRCR
+L.MSG.PSTR		.DA MSG.PSTR
 L.MSG.ERROR		.DA MSG.ERROR
 L.MSG.PRINTENV	.DA MSG.PRINTENV
 L.MSG.CSHERR	.DA MSG.CSHERR
@ -137,7 +139,7 @@ CS.INIT			jsr SetPWD
 				bcs .9
 				
 				>LDYA L.MSG.GREETINGS
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 *				clc
 .9				rts				
@ -150,7 +152,7 @@ CS.RUN			ldy #VarBuffer			READ Command ?
 				lda (pPs),y
 				beq .11
 				
-				jsr ERR.Print
+				jsr IO.PrintErrMsg
 				bcs CS.RUN.EXIT.RTS
 				
 .11				ldy #bPause
@ -281,7 +283,7 @@ CS.RUN.BATCH	jsr	CSH.Run
 				>PUSHB (pData),y
 				
 				>LDYA L.MSG.CSHERR
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				
 				jsr CSH.RestorePtr
 				
@ -386,7 +388,7 @@ CS.CHARIN		tax

 .1				cpx #$7f
 				bne .2
-				jsr CmdBuffer.DEL
+				jsr CmdLine.DEL
 				clc
 				rts

@ -437,13 +439,13 @@ CS.CHARIN.CTRL	cpx #13					CR
 .11				cpx #3					Ctrl-C
 				bne .1

-				jsr CmdBuffer.CLR
+				jsr CmdLine.CLR
 				clc
 				rts
 				
 .1				cpx #8					BS (left arrow)
 				bne .2
-				jsr CmdBuffer.DEL
+				jsr CmdLine.DEL
 				clc
 				rts
 				
@ -501,7 +503,7 @@ PrintPrompt		>LDYA L.ENV.PS1
 				phx
 				>PUSHYA
 				>LDYA L.MSG.PROMPT
-				>SYSCALL PPrintFYA
+				>SYSCALL PrintFYA
 				plx
 				php
 				pha
@ -511,11 +513,11 @@ PrintPrompt		>LDYA L.ENV.PS1
 				plp
 .9				rts
 *--------------------------------------
-CmdBuffer.CLR	jsr CmdBuffer.DEL
-				bne CmdBuffer.CLR
+CmdLine.CLR		jsr CmdLine.DEL
+				bne CmdLine.CLR
 				rts
 *--------------------------------------
-CmdBuffer.DEL	lda (pData)
+CmdLine.DEL		lda (pData)
 				beq .9
 				lda #8
 				>SYSCALL PutCA
@ -523,10 +525,15 @@ CmdBuffer.DEL	lda (pData)
 				dec
 				sta (pData)
 .9				rts
+*--------------------------------------
+CmdLine.SET		>PUSHW pData
+				>LDYA L.MSG.PSTR
+				>SYSCALL PrintfYA
+				rts
 *--------------------------------------
 				.INB /A2OSX.SRC/SBIN/SHELL.S.CMD
 				.INB /A2OSX.SRC/SBIN/SHELL.S.CSH
-				.INB /A2OSX.SRC/SBIN/SHELL.S.ERR
+				.INB /A2OSX.SRC/SBIN/SHELL.S.IO
 				.INB /A2OSX.SRC/SBIN/SHELL.S.HIS
 *--------------------------------------
 CS.END
@ -556,14 +563,16 @@ CSHCMDS			>PSTR "IF"
 				>PSTR "FLOAT"
 				.HS 00
 *--------------------------------------
-MSG.GREETINGS	>PSTR "\r\nA2osX-Shell\r\n\r\n"
-MSG.PROMPT		>PSTR "%S$ "
-MSG.ECHO		>PSTR ">%S\r\n"
-MSG.ERROR		>PSTR "Err:%S [%h]\r\n"
-MSG.PRINTENV	>PSTR "%S=%S\r\n"
+MSG.GREETINGS	>CSTR "\r\nA2osX-Shell\r\n\r\n"
+MSG.PROMPT		>CSTR "%S$ "
+MSG.ECHO		>CSTR ">%S\r\n"
+MSG.PSTRCR		>CSTR "%S\r\n"
+MSG.PSTR		>CSTR "%S"
+MSG.ERROR		>CSTR "Err:%S [%h]\r\n"
+MSG.PRINTENV	>CSTR "%S=%S\r\n"
 MSG.CSHERR		>PSTR "Pos %D:"
-FMT.DATE		>PSTR "%A, %B %d %Y"
-FMT.TIME		>PSTR "%H:%M:%S (%I:%M:%S%p)"
+FMT.DATE		>CSTR "%A, %B %d %Y"
+FMT.TIME		>CSTR "%H:%M:%S (%I:%M:%S%p)"
 *--------------------------------------
 				.INB /A2OSX.SRC/X.ERRORS.S
 *--------------------------------------
@ -591,10 +600,13 @@ bExit			.BS 1
 bEcho			.BS 1
 bSecureRead		.BS 1
 bExitOnEOF		.BS 1
-HIS.hBuf		.BS 1
-CmdHistory.IDX	.BS 1
-CmdHistory.END	.BS 1
 Sleep			.BS 4
+HIS.hBuf		.BS 1
+HIS.BufIndex	.BS 1
+HIS.BufEnd		.BS 1
+IO.hIn			.BS 1
+IO.hOut			.BS 1
+IO.hErr			.BS 1
 CSH.hBuf		.BS 1
 CSH.BufPtr		.BS 2
 CSH.BufLen		.BS 2
--- a/SBIN/TCPIP.S.CFG.txt
+++ b/SBIN/TCPIP.S.CFG.txt
@ -7,7 +7,7 @@ AUTO 6
 *--------------------------------------
 CFG.Read		>PUSHW L.HOSTNAME
 				>LDYA L.MSG.CFG
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				jsr CFG.Read.HOSTNAME
 				bcc .1
@ -15,11 +15,11 @@ CFG.Read		>PUSHW L.HOSTNAME
 				>LDYA L.MSG.CFG.KO
 				bra .2
 .1				>LDYA L.MSG.CFG.OK
-.2				>SYSCALL CPrintFYA
+.2				>SYSCALL PrintFYA

 				>PUSHW L.TCPIP.CONF
 				>LDYA L.MSG.CFG
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				jsr CFG.Read.TCPIP.CONF
 				bcc .3
@ -27,20 +27,20 @@ CFG.Read		>PUSHW L.HOSTNAME
 				>LDYA L.MSG.CFG.KO
 				bra .4
 .3				>LDYA L.MSG.CFG.OK
-.4				>SYSCALL CPrintFYA
+.4				>SYSCALL PrintFYA
 				
 				>PUSHW L.HOSTS
 				>LDYA L.MSG.CFG
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				jsr CFG.Read.HOSTS
 				bcc .5
 				>PUSHA
 				>LDYA L.MSG.CFG.KO
 				bra .6
-.5				>SYSCALL CPrintFYA
+.5				>SYSCALL PrintFYA
 .6				>LDYA L.MSG.CFG.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				rts
 *--------------------------------------
 CFG.Read.HOSTNAME
--- a/SBIN/TCPIP.S.txt
+++ b/SBIN/TCPIP.S.txt
@ -95,7 +95,7 @@ CS.INIT.DEV		>LDYA L.DEVNAME
 				bne CS.INIT.DEV

 				>LDYA L.MSG.DEV.KO
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #$28				MLI.ERR.NODEV
 				sec
 				rts
@ -107,7 +107,7 @@ CS.INIT.DEV		>LDYA L.DEVNAME
 				
 				>PUSHW L.DEVNAME
 				>LDYA L.MSG.DEV.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				ldx #DEVMGR.OPEN
 				jsr NetDevJmp
--- a/SBIN/TELNETD.S.txt
+++ b/SBIN/TELNETD.S.txt
@ -60,7 +60,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 CS.RUN			jsr Init.Timeout

 				>LDYA L.MSG.TCPWAIT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 .1				>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
 				bcs .99
@ -79,7 +79,7 @@ CS.RUN			jsr Init.Timeout
 				jmp CS.RUN.ABORT
 				
 .99				>LDYA L.MSG.TCPIPERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec	
 				rts
@ -100,7 +100,7 @@ CS.RUN.INIT		ldx #3
 				sta (pData),y
 				
 				>LDYA L.MSG.INITOK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 .2				>SYSCALL Sleep
 				jsr CS.RUN.SERVER
@ -110,13 +110,13 @@ CS.RUN.INIT		ldx #3
 				bra .2
 				
 .9				>LDYA L.MSG.SKTERR
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #SYSMGR.ERRSYN
 				sec	
 				rts
 				
 CS.RUN.ABORT	>LDYA L.MSG.ABORT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				lda #0
 				
 CS.RUN.ERR		sec	
@ -161,7 +161,7 @@ CS.RUN.SERVER	ldy #hSrvSocket
 				>PUSHA
 				
 				>LDYA L.MSG.INCOMING
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 .8				clc
 .9				rts
 *--------------------------------------
@ -192,7 +192,7 @@ CS.RUN.CLIENT	ldy #SktIndex
 .10				sta .2+1
 				>PUSHA
 				>LDYA L.MSG.BYTE
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 			
 .1				lda #$ff				hSocket
 				>PUSHA
--- a/SYS/KERNEL.S.CIO.txt
+++ b/SYS/KERNEL.S.CIO.txt
@ -102,10 +102,21 @@ K.SScanF.IsDigit
 .1				sec
 				rts				
 */--------------------------------------
-* # PPrintFYA/CPrintFYA
+* # PrintFYA/SPrintFYA/FPrintFYA
 * Prints Pascal/C-Style String
 * ## In:
-*  Y,A = PTR to PStr/CStr
+*  PrintFYA : 
+*   Y,A = PTR to CStr
+*  SPrintFYA : 
+*   Y,A = PTR to CStr
+*   PULLW = Ptr to Dst Buffer
+*  FPrintFYA : 
+*   Y,A = PTR to CStr
+*   PULLB = hDev
+* ## Out:
+*  CC : success
+*  CS : error code from Output
+*  Specifiers :
 *   %a : pull 2 bytes to Print Access right String 'drwxrwxrwx'
 *   %b : pull 1 byte to Print BIN 
 *   %B : pull 2 bytes to Print BIN
@ -137,19 +148,21 @@ K.SScanF.IsDigit
 *   %11s  : 'ABCDEFGH   '	
 *   %011s : 'ABCDEFGH000'
 *   %2f	  :	'3.14'
-* ## Out:
-*  CC : success
-*  CS : I/O error from COut
 *\--------------------------------------
+K.SPrintFYA		>STYA ZPPtr1
+				>PULLW Printf.Cout.Ptr+1
+				
+K.FPrintFYA		>STYA ZPPtr1
+
 K.PPrintFYA		ldx #$01				PSTR
 				.HS 2C					bit abs
-K.CPrintFYA		ldx #$00				CSTR
+K.PrintFYA		ldx #$00				CSTR
 				>STYA ZPPtr1
-				stx CIO.GetCharAtPtr1Y+1
+				stx Printf.GetCharAtPtr1Y+1

 				ldy	#0				
 				
-.1				jsr CIO.GetCharAtPtr1Y
+.1				jsr Printf.GetCharAtPtr1Y
 				beq .99 
 				cmp #'%'
 				bne .10
@ -159,7 +172,7 @@ K.CPrintFYA		ldx #$00				CSTR
 				sta PADCHAR
 				
 .2				ldx	#PrintFTBL1.END-PrintFTBL1-1
-				jsr CIO.GetCharAtPtr1Y
+				jsr Printf.GetCharAtPtr1Y
 				beq .99
 				
 .3				cmp PrintFTBL1,x		do we have a %x command?
@ -208,7 +221,7 @@ K.CPrintFYA		ldx #$00				CSTR
 				bne .20
 				
 				ldx	#PrintFTBL2.END-PrintFTBL2-1
-				jsr CIO.GetCharAtPtr1Y
+				jsr Printf.GetCharAtPtr1Y
 				beq .99
 .12				cmp PrintFTBL2,x
 				beq .13
@ -218,7 +231,7 @@ K.CPrintFYA		ldx #$00				CSTR
 				
 .13				lda	PrintFTBL2.OUT,x	

-.20				jsr	K.PutCA
+.20				jsr	Printf.Cout
 				bcc	.1
 .99				rts
 *--------------------------------------
@ -249,7 +262,7 @@ PrintF.A		>PULLW HEXBUF
 				lsr
 				tax
 				lda TYPES,x
-				jsr K.PutCA
+				jsr Printf.Cout
 				bcs .9
 				
 				ldx #0
@ -259,7 +272,7 @@ PrintF.A		>PULLW HEXBUF
 				bcc .2
 				lda ACCESS,x
 				
-.2				jsr K.PutCA
+.2				jsr Printf.Cout
 				bcs .9
 				
 				inx
@ -271,7 +284,7 @@ PrintF.A		>PULLW HEXBUF
 				bcc .4
 				lda ACCESS,x
 				
-.4				jmp K.PutCA
+.4				jmp Printf.Cout

 .9				rts
 *--------------------------------------
@ -290,7 +303,7 @@ PrintF.B.1		ldx #8
 				pha
 				lda #'0'
 				adc #0					add Carry
-				jsr K.PutCA
+				jsr Printf.Cout
 				pla
 				bcs PrintF.BB.RTS
 				dex
@ -409,11 +422,11 @@ PRINTDEC		lda PADLEN			any Len format ?
 				bpl .5
 				pha					yes, save whatever we have to print....
 				lda #'-'
-				jsr K.PutCA
+				jsr Printf.Cout
 				stz SIGN			reset flag for next char...
 				pla
 				
-.5				jsr K.PutCA
+.5				jsr Printf.Cout
 				bcs .9

 .6				inx
@ -437,7 +450,7 @@ PrintF.NN.2		ora #$30
 				cmp #$3A
 				bcc .1
 				adc #6
-.1				jmp K.PutCA
+.1				jmp Printf.Cout
 *--------------------------------------
 PrintF.S		ldy #$ff				CSTR
 				.HS 2C					bit abs
@ -462,7 +475,7 @@ PrintF.SS		ldy #$00				PSTR
 				lda	(ZPPtr2),y
 				beq .2
 		
-				jsr K.PutCA
+				jsr Printf.Cout
 				bcs .9

 				lda PADLEN
@ -477,7 +490,7 @@ PrintF.SS		ldy #$00				PSTR
 				beq .8
 				
 .3				lda PADCHAR				
-				jsr K.PutCA
+				jsr Printf.Cout
 				bcs .9
 				iny
 				cpy PADLEN
@ -486,7 +499,7 @@ PrintF.SS		ldy #$00				PSTR
 .8				clc
 .9				rts
 *--------------------------------------
-CIO.GetCharAtPtr1Y
+Printf.GetCharAtPtr1Y
 				lda #$ff				Self Modified PSTR/CSTR
 				bne .1		
 				
@ -506,6 +519,11 @@ CIO.GetCharAtPtr1Y
 				
 .9				clc						no error, but end of string
 				rts				
+*--------------------------------------
+Printf.Cout		jmp K.PutCA
+
+Printf.Cout.Ptr	sta $ffff				Self modified
+
 */--------------------------------------
 * # AToI
 * Convert String to 32 bit int
--- a/SYS/KERNEL.S.INIT3.txt
+++ b/SYS/KERNEL.S.INIT3.txt
@ -12,30 +12,30 @@ Kernel.Init3	sta SETALTZP
 				jsr PS0Init
 				bcs * 
 				>LDYAI MSG.Init3
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LDYAI MSG.DEV
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				jsr DevMgrInit
 				bcs *

 				>LDYAI MSG.IRQ
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				jsr IrqMgrInit
 				bcs *

 				>LDYAI MSG.EVT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				jsr EvtMgrInit
 				bcs *

 				>LDYAI MSG.FLT
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				jsr FltMgrInit
 				bcs *

 				>LDYAI MSG.TSK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				jsr TskMgrInit
 				bcs *

@ -45,11 +45,11 @@ Kernel.Init3	sta SETALTZP
 				 
 				>PUSHYA
 				>LDYAI MSG.Prefix
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				>PUSHWI STARTUP.CMDLINE
 				>LDYAI MSG.Startup
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA

 				>LDYAI STARTUP.CMDLINE
 				>SYSCALL ExpandPStrYA
@ -60,7 +60,7 @@ Kernel.Init3	sta SETALTZP
 				>SYSCALL FreeMemA		...discard...
 				
 				>LDYAI MSG.Init3.OK
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				
 				>LDYAI TskMgr.Table
 				>STYA pPs
@ -73,7 +73,7 @@ Kernel.Init3	sta SETALTZP
 				
 .9				>PUSHA
 				>LDYAI MSG.StartupErr
-				>SYSCALL CPrintFYA
+				>SYSCALL PrintFYA
 				bra *					No need to discard Expanded CMDLINE 
 *--------------------------------------
 MemMgrInit		>LDYAI MemMgr.MHiMem
--- a/SYS/KERNEL.S.JMP.txt
+++ b/SYS/KERNEL.S.JMP.txt
@ -48,10 +48,10 @@ K.SYSCALL.JMP	.DA K.FileSearch 		$00
 *--------------------------------------
 				.DA 0					$40
 				.DA K.SScanF
-				.DA K.PPrintFYA
-				.DA K.CPrintFYA
-				.DA 0
 				.DA 0
+				.DA K.PrintFYA
+				.DA K.SPrintFYA
+				.DA K.FPrintFYA
 				.DA K.AToI
 				.DA 0
 *--------------------------------------
@ -61,7 +61,7 @@ K.SYSCALL.JMP	.DA K.FileSearch 		$00
 				.DA K.PStrMatch
 				.DA K.PStrUprYA
 				.DA K.PStrLwrYA
-				.DA K.PStrFTime	
+				.DA K.StrFTime	
 				.DA K.PStr2StrArrayYA
 *--------------------------------------
 				.DA K.ExecProcessNewEnvYA	$60
--- a/SYS/KERNEL.S.MEM.txt
+++ b/SYS/KERNEL.S.MEM.txt
@ -365,7 +365,7 @@ K.FreeMemA	    phy
 				>PUSHYA
 				
 				>LDYAI K.FreeMemA.ERR
-				jsr K.CPrintFYA
+				jsr K.PrintFYA
 				
 .91				ldx #$ff				
 				bit $C000,x
--- a/SYS/KERNEL.S.RUN.txt
+++ b/SYS/KERNEL.S.RUN.txt
@ -92,7 +92,7 @@ RUN.DumpEvent	ldy #S.EVT-1
 				bpl .1
 				
 				>LDYAI MSG.DumpEvent
-				jmp K.CPrintFYA
+				jmp K.PrintFYA
 *--------------------------------------
 MSG.DumpEvent	>CSTR "!Evt:F=%b,Dev=$%h,LO=$%h,HI=$%h,W1=$%H,W2=$%H\n"
 SYS.CPULOADI 	.BS 1
--- a/SYS/KERNEL.S.STR.txt
+++ b/SYS/KERNEL.S.STR.txt
@ -200,10 +200,10 @@ K.PStrLwrYA		ldx #2
 *--------------------------------------
 K.PStrUprLwr	.AS "azAZ"
 */--------------------------------------
-* # PStrFTime
-* Convert S.TIME struct to PSTR
+* # StrFTime
+* Convert S.TIME struct to CSTR
 * ## In: 
-*  PUSHW = Dst PTR To PSTR Buf
+*  PUSHW = Dst PTR To CSTR Buf
 *  PUSHW = Src PTR To Format String
 *   %a : Abbreviated weekday name : Thu
 *   %A : Full weekday name : Thursday 
@ -223,100 +223,95 @@ K.PStrUprLwr	.AS "azAZ"
 * ## Out:
 *   none. always succeed.
 *\--------------------------------------
-K.PStrFTime		jsr PullPtr1Ptr2Ptr3
+K.StrFTime		jsr PullPtr1Ptr2Ptr3
 				
-				lda #0
-				sta (ZPPtr3)		Reset target PSTR  length
+				ldy #0
 				
-				tay
-				
-.1				iny
-				lda (ZPPtr2),y
-				cmp #'%'
-				beq .2
-				
-				phy
-				jsr K.PStrFTime.addChar
-				ply
-.10				tya
-				cmp (ZPPtr2)
-				bne .1
-				rts
-				
-.2				tya
-				cmp (ZPPtr2)
+.1				lda (ZPPtr2),y
 				beq .8
 				
 				iny
-				ldx #K.PStrFTime.JMPL-K.PStrFTime.Tbl-1
 				
-.3				lda (ZPPtr2),y
-				cmp K.PStrFTime.Tbl,x
+				cmp #'%'
+				beq .2
+				
+				jsr K.StrFTime.addChar
+				bra .1
+				
+.2				ldx #K.StrFTime.JMPL-K.StrFTime.Tbl-1
+				
+				lda (ZPPtr2),y
+				beq .8
+				iny
+				
+.3				cmp K.StrFTime.Tbl,x
 				beq .4
 				dex
 				bpl .3
-				beq .10
+				bra .1
 				
-.4				lda K.PStrFTime.JMPL,x
+.4				lda K.StrFTime.JMPL,x
 				sta .5+1
-				lda K.PStrFTime.JMPH,x
+				lda K.StrFTime.JMPH,x
 				sta .5+2
 				phy
 .5				jsr $ffff
 				ply
-				bra .10
+				bra .1	

-.8				rts			
+.8				lda #0					Terminate C string
+				sta (ZPPtr3)
+				rts
 *--------------------------------------
-K.PStrFTime.TBL	.AS "aAbBdHImMpSwyY"
-K.PStrFTime.JMPL .DA #K.PStrFTime.A
-				.DA #K.PStrFTime.AA
-				.DA #K.PStrFTime.B
-				.DA #K.PStrFTime.BB
-				.DA #K.PStrFTime.D
-				.DA #K.PStrFTime.HH
-				.DA #K.PStrFTime.II
-				.DA #K.PStrFTime.M
-				.DA #K.PStrFTime.MM
-				.DA #K.PStrFTime.P
-				.DA #K.PStrFTime.SS
-				.DA #K.PStrFTime.W
-				.DA #K.PStrFTime.Y
-				.DA #K.PStrFTime.YY
+K.StrFTime.TBL	.AS "aAbBdHImMpSwyY"
+K.StrFTime.JMPL .DA #K.StrFTime.A
+				.DA #K.StrFTime.AA
+				.DA #K.StrFTime.B
+				.DA #K.StrFTime.BB
+				.DA #K.StrFTime.D
+				.DA #K.StrFTime.HH
+				.DA #K.StrFTime.II
+				.DA #K.StrFTime.M
+				.DA #K.StrFTime.MM
+				.DA #K.StrFTime.P
+				.DA #K.StrFTime.SS
+				.DA #K.StrFTime.W
+				.DA #K.StrFTime.Y
+				.DA #K.StrFTime.YY
 *--------------------------------------
-K.PStrFTime.JMPH	.DA /K.PStrFTime.A
-				.DA /K.PStrFTime.AA
-				.DA /K.PStrFTime.B
-				.DA /K.PStrFTime.BB
-				.DA /K.PStrFTime.D
-				.DA /K.PStrFTime.HH
-				.DA /K.PStrFTime.II
-				.DA /K.PStrFTime.M
-				.DA /K.PStrFTime.MM
-				.DA /K.PStrFTime.P
-				.DA /K.PStrFTime.SS
-				.DA /K.PStrFTime.W
-				.DA /K.PStrFTime.Y
-				.DA /K.PStrFTime.YY
+K.StrFTime.JMPH	.DA /K.StrFTime.A
+				.DA /K.StrFTime.AA
+				.DA /K.StrFTime.B
+				.DA /K.StrFTime.BB
+				.DA /K.StrFTime.D
+				.DA /K.StrFTime.HH
+				.DA /K.StrFTime.II
+				.DA /K.StrFTime.M
+				.DA /K.StrFTime.MM
+				.DA /K.StrFTime.P
+				.DA /K.StrFTime.SS
+				.DA /K.StrFTime.W
+				.DA /K.StrFTime.Y
+				.DA /K.StrFTime.YY
 *--------------------------------------
-K.PStrFTime.A	ldx #3					Short day of week, 3 chars...
+K.StrFTime.A	ldx #3					Short day of week, 3 chars...
 				.HS	2C					Bit abs				
 				 
-K.PStrFTime.AA	ldx #15					full DoW
-				>LDYAI K.PStrFTime.DAY
+K.StrFTime.AA	ldx #15					full DoW
+				>LDYAI K.StrFTime.DAY
 				>STYA ZPPtr4		
 				ldy #S.Time.WDAY
-				bra K.PStrFTime.STR
+				bra K.StrFTime.STR
 				
-K.PStrFTime.B	ldx #3					Short Month, 3 chars....
+K.StrFTime.B	ldx #3					Short Month, 3 chars....
 				.HS	2C					Bit abs
 				
-K.PStrFTime.BB	ldx #15					full Month....
-				>LDYAI K.PStrFTime.MON
+K.StrFTime.BB	ldx #15					full Month....
+				>LDYAI K.StrFTime.MON
 				>STYA ZPPtr4		
 				ldy #S.Time.MONTH
 				
-K.PStrFTime.STR	lda (ZPPtr1),y 	get required S.Time field value
+K.StrFTime.STR	lda (ZPPtr1),y 			get required S.Time field value
 				tay
 				beq .9					Illegal value
 				
@ -335,7 +330,7 @@ K.PStrFTime.STR	lda (ZPPtr1),y 	get required S.Time field value
 .3				iny
 				lda (ZPPtr4),y
 				phy
-				jsr K.PStrFTime.addChar
+				jsr K.StrFTime.addChar
 				pla
 				cmp (ZPPtr4)
 				beq .8
@ -347,86 +342,83 @@ K.PStrFTime.STR	lda (ZPPtr1),y 	get required S.Time field value
 				
 .9				ldx #3
 				lda #'?'
-.99				jsr K.PStrFTime.addChar
+.99				jsr K.StrFTime.addChar
 				dex
 				bne .99
 				rts
-				
-K.PStrFTime.D	ldy #S.Time.DAY
-				bra K.PStrFTime.addDecPtr1Y
-K.PStrFTime.HH	ldy #S.Time.HOUR
-				bra K.PStrFTime.addDecPtr1Y
-K.PStrFTime.II	ldy #S.Time.HOUR
+*--------------------------------------
+K.StrFTime.D	ldy #S.Time.DAY
+				bra K.StrFTime.addDecPtr1Y
+K.StrFTime.HH	ldy #S.Time.HOUR
+				bra K.StrFTime.addDecPtr1Y
+K.StrFTime.II	ldy #S.Time.HOUR
 				lda (ZPPtr1),y
 				cmp #12
 				bcc .1
 				sbc #12
-.1				bra K.PStrFTime.addDecA
-K.PStrFTime.M	ldy #S.Time.MONTH
-				bra K.PStrFTime.addDecPtr1Y
-K.PStrFTime.MM	ldy #S.Time.MINUTE
-				bra K.PStrFTime.addDecPtr1Y
-K.PStrFTime.P	ldy #S.Time.HOUR
+.1				bra K.StrFTime.addDecA
+K.StrFTime.M	ldy #S.Time.MONTH
+				bra K.StrFTime.addDecPtr1Y
+K.StrFTime.MM	ldy #S.Time.MINUTE
+				bra K.StrFTime.addDecPtr1Y
+K.StrFTime.P	ldy #S.Time.HOUR
 				lda (ZPPtr1),y
 				cmp #12
 				bcc .1
 				lda #'p'
 				.HS 2C					bit abs
 .1				lda #'a'
-				jsr K.PStrFTime.addChar
+				jsr K.StrFTime.addChar
 				lda #'m'
-				bra K.PStrFTime.addChar
-K.PStrFTime.SS	ldy #S.Time.SECOND
-				bra K.PStrFTime.addDecPtr1Y
-K.PStrFTime.W	ldy #S.Time.WDAY
-				bra K.PStrFTime.addDecPtr1Y
-K.PStrFTime.YY	ldy #S.Time.CENTURY
-				jsr K.PStrFTime.addDecPtr1Y
-K.PStrFTime.Y	ldy #S.Time.YEAR
+				bra K.StrFTime.addChar
+K.StrFTime.SS	ldy #S.Time.SECOND
+				bra K.StrFTime.addDecPtr1Y
+K.StrFTime.W	ldy #S.Time.WDAY
+				bra K.StrFTime.addDecPtr1Y
+K.StrFTime.YY	ldy #S.Time.CENTURY
+				jsr K.StrFTime.addDecPtr1Y
+K.StrFTime.Y	ldy #S.Time.YEAR
 *--------------------------------------
-K.PStrFTime.addDecPtr1Y
+K.StrFTime.addDecPtr1Y
 				lda (ZPPtr1),y
-K.PStrFTime.addDecA
-				sta K.PStrFTime.BIN
-				stz K.PStrFTime.DEC
+K.StrFTime.addDecA
+				sta K.StrFTime.BIN
+				stz K.StrFTime.DEC
 				
 				sed
 				ldx #8
 				
-.1				asl K.PStrFTime.BIN
+.1				asl K.StrFTime.BIN

-				lda K.PStrFTime.DEC
-				adc K.PStrFTime.DEC
-				sta K.PStrFTime.DEC
+				lda K.StrFTime.DEC
+				adc K.StrFTime.DEC
+				sta K.StrFTime.DEC
 				
 				dex
 				bne .1
 				
 				cld

-*				lda K.PStrFTime.DEC		already in A
+*				lda K.StrFTime.DEC		already in A
 				pha
 				lsr
 				lsr
 				lsr
 				lsr
 				ora #$30
-				jsr K.PStrFTime.addChar
+				jsr K.StrFTime.addChar
 				pla
 				and #$0f
 				ora #$30
 *--------------------------------------
-K.PStrFTime.addChar
-				pha
-				lda (ZPPtr3)
-				inc
+K.StrFTime.addChar
 				sta (ZPPtr3)
-				tay
-				pla
-				sta (ZPPtr3),y
-				rts
+				inc ZPPtr3
+				bne .8
+				inc ZPPtr3+1
+.8				rts
 *--------------------------------------
-K.PStrFTime.DAY	>PSTR "Monday"
+K.StrFTime.DAY	>PSTR "Monday"
 				>PSTR "Tuesday"
 				>PSTR "Wednesday"
 				>PSTR "Thursday"
@ -434,7 +426,7 @@ K.PStrFTime.DAY	>PSTR "Monday"
 				>PSTR "Saturday"
 				>PSTR "Sunday"
 *--------------------------------------
-K.PStrFTime.MON	>PSTR "January"
+K.StrFTime.MON	>PSTR "January"
 				>PSTR "February"
 				>PSTR "March"
 				>PSTR "April"
@ -447,8 +439,8 @@ K.PStrFTime.MON	>PSTR "January"
 				>PSTR "November"
 				>PSTR "December"
 *--------------------------------------
-K.PStrFTime.BIN	.BS 1
-K.PStrFTime.DEC	.BS 1					always < 100
+K.StrFTime.BIN	.BS 1
+K.StrFTime.DEC	.BS 1					always < 100
 */--------------------------------------
 * # PStr2StrArrayYA
 * Convert a PSTR (e.g. : command Line) to a Array of PSTRs (Args[])
@ -482,10 +474,10 @@ K.PStr2StrArrayYA
 				
 				ldy #0				reset index in dst token

-.3				inc ZPPtr1		get...
+.3				inc ZPPtr1			get...
 				bne .4
 				inc ZPPtr1+1
-.4				lda (ZPPtr1)	...next char
+.4				lda (ZPPtr1)		...next char

 				cmp #' '			found a space ?
 				bne .6
@ -493,9 +485,9 @@ K.PStr2StrArrayYA
 				tya					in a token ?
 				beq .7				no, skip & go to next char
 				
-				sta (ZPPtr2)	yes, set this token len
+				sta (ZPPtr2)		yes, set this token len
 				sec
-				adc ZPPtr2		advance to next token
+				adc ZPPtr2			advance to next token
 				sta ZPPtr2
 				bcc .5
 				inc ZPPtr2+1
@ -512,15 +504,15 @@ K.PStr2StrArrayYA
 				tya					yes, are we in a token ?
 				beq .8
 				
-				sta (ZPPtr2)	yes, set last token len
+				sta (ZPPtr2)		yes, set last token len
 				sec
-				adc ZPPtr2		advance to next token
+				adc ZPPtr2			advance to next token
 				sta ZPPtr2
 				bcc .8
 				inc ZPPtr2+1
 				
 .8				lda #0
-				sta (ZPPtr2)	set Array Ending 0
+				sta (ZPPtr2)		set Array Ending 0
 				
 				pla					get back PTR.HI
 				ply					get back PTR.LO
--- a/SYS/KERNEL.S.txt
+++ b/SYS/KERNEL.S.txt
@ -14,28 +14,7 @@ AUTO 6
 				.INB INC/PRODOS.I
 				.INB INC/MLI.ERR.I

-ZPPtr1			.EQ ZPKERNEL
-ZPPtr2			.EQ ZPKERNEL+2
-ZPPtr3			.EQ ZPKERNEL+4
-ZPPtr4			.EQ ZPKERNEL+6
-
-				sei
- 				ldx	#$FF
-				txs
-				sta SETALTZP
-
-				stx A2osX.SaveSM
-				stx A2osX.SaveSX
-
-				sta CLRALTZP			Make sure MAIN ZP is enabled for X.PRINT.F
-				cli
-				
-				jsr Kernel.Init2
-				>DEBUGOA
-				jmp Kernel.Init3
-
-				.INB /A2OSX.SRC/SYS/KERNEL.S.INIT2
-				.INB /A2OSX.SRC/SYS/KERNEL.S.INIT3
+				.INB /A2OSX.SRC/SYS/KERNEL.S.INIT
 				.INB /A2OSX.SRC/X.PRINTF.S

 A2osX.GP		.PH $BD00
@ -76,16 +55,16 @@ A2osX.E0		.PH $E000
 A2osX.E0.E		.EQ *
 * CONTROL SECTION :
 				.LIST ON
-				.DO A2osX.D1-A2osX.GP>$200
-* ERROR:GP too big
-				.FIN
-				.DO A2osX.D2-A2osX.D1>$1000
-* ERROR:BNK1 too big
-				.FIN
-				.DO A2osX.E0-A2osX.D2>$1000
-* ERROR:BNK2 too big
-				.FIN		
+A2osX.D1.S		.EQ A2osX.D2-A2osX.D1
+A2osX.D2.S		.EQ A2osX.E0-A2osX.D2
+A2osX.E0.S		.EQ A2osX.E0.E-A2osX.E0
 				.LIST OFF
+				.DO A2osX.D2.S>$1000
+				ERROR:BNK1 too big
+				.FIN
+				.DO A2osX.D2.S>$1000
+				ERROR:BNK2 too big
+				.FIN		
 MAN
 SAVE /A2OSX.SRC/SYS/KERNEL.S
 ASM