diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index c776a429..6877c41a 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/ACOS.S.KW.txt b/BIN/ACOS.S.KW.txt
index 0b34dba3..af8d45b2 100644
--- a/BIN/ACOS.S.KW.txt
+++ b/BIN/ACOS.S.KW.txt
@@ -109,7 +109,7 @@ KW.FOR			jsr CORE.GetNextCharNB
 KW.NEXT			ldy pCCS
 				bmi .98
 
-				lda (pdata),y
+				lda (pData),y
 				cmp #KWID.FOR
 				bne .98
 
diff --git a/BIN/ATLOGON.S.txt b/BIN/ATLOGON.S.txt
index 930b8cf6..a4fb3cde 100644
--- a/BIN/ATLOGON.S.txt
+++ b/BIN/ATLOGON.S.txt
@@ -551,7 +551,7 @@ P.GetParms		.BS $07
 P.GetStatus		.BS $14
 P.FILogin		.BS $19
 NameBuf			.BS 36
-lookupBuf		.BS 5+99
+LookupBuf		.BS 5+99
 DS.END
 				.ED
 *--------------------------------------
diff --git a/BIN/ATMOUNT.S.txt b/BIN/ATMOUNT.S.txt
index 3fea6a52..c656b551 100644
--- a/BIN/ATMOUNT.S.txt
+++ b/BIN/ATMOUNT.S.txt
@@ -165,7 +165,7 @@ CS.RUN.ListVols	lda A2osX.ATLKSID
 				bcs .9
 
 				>LDYA L.MSG.VOLLIST
-				>SYSCALL Puts
+				>SYSCALL PutS
 				
 				lda ZPReplyBuf
 				clc
diff --git a/BIN/ATTR.S.txt b/BIN/ATTR.S.txt
index 6d15462f..732c04a6 100644
--- a/BIN/ATTR.S.txt
+++ b/BIN/ATTR.S.txt
@@ -33,8 +33,6 @@ bContinue		.BS 1
 bRecurse		.BS 1
 bPause			.BS 1
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -407,7 +405,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/BIN/CC.S.LINK.txt b/BIN/CC.S.LINK.txt
index 0b953a95..b21ac548 100644
--- a/BIN/CC.S.LINK.txt
+++ b/BIN/CC.S.LINK.txt
@@ -2,7 +2,7 @@ NEW
   AUTO 3,1
 *--------------------------------------
 CC.Link			>LDYA L.MSG.LINKING
-				>SYSCALL Puts
+				>SYSCALL PutS
 
 				ldy #0
 				lda #1
@@ -257,7 +257,7 @@ CC.Link.CheckMain
 				rts
 
 .9				>LDYA L.MSG.NOMAIN
-				>SYSCALL puts
+				>SYSCALL putS
 				lda #E.CSYN
 				sec
 .99				rts
diff --git a/BIN/CHAUX.S.txt b/BIN/CHAUX.S.txt
index 351add22..2e5700a6 100644
--- a/BIN/CHAUX.S.txt
+++ b/BIN/CHAUX.S.txt
@@ -38,8 +38,6 @@ bPause			.BS 1
 bContinue		.BS 1
 bRecurse		.BS 1
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -284,7 +282,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/BIN/CHGRP.S.txt b/BIN/CHGRP.S.txt
index 97cd59d9..e6e84f41 100644
--- a/BIN/CHGRP.S.txt
+++ b/BIN/CHGRP.S.txt
@@ -24,8 +24,6 @@ ZPFileName		.BS 2
 ZPFileStat		.BS 2
 ZPFullPath		.BS 2
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -277,7 +275,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/BIN/CHMOD.S.txt b/BIN/CHMOD.S.txt
index 56f981fb..1b19cc4d 100644
--- a/BIN/CHMOD.S.txt
+++ b/BIN/CHMOD.S.txt
@@ -27,8 +27,6 @@ ZPMode			.BS 2
 ArgIndex		.BS 1
 StrMode			.BS 1
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -317,7 +315,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/BIN/CHOWN.S.txt b/BIN/CHOWN.S.txt
index bc290cdb..2471d534 100644
--- a/BIN/CHOWN.S.txt
+++ b/BIN/CHOWN.S.txt
@@ -24,8 +24,6 @@ ZPFileName		.BS 2
 ZPFileStat		.BS 2
 ZPFullPath		.BS 2
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -276,7 +274,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt
index 851f4b65..53ab46c8 100644
--- a/BIN/CHTYP.S.txt
+++ b/BIN/CHTYP.S.txt
@@ -37,8 +37,6 @@ bPause			.BS 1
 bContinue		.BS 1
 bRecurse		.BS 1
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -280,7 +278,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/BIN/DU.S.txt b/BIN/DU.S.txt
index 732461d0..0eaa2fb2 100644
--- a/BIN/DU.S.txt
+++ b/BIN/DU.S.txt
@@ -36,10 +36,7 @@ bAllFiles       .BS 1
 ArgCount        .BS 1
 ArgDir			.BS 1
 
-hFilter			.BS 1
-
-ZS.END
-                 .ED
+ZS.END          .ED
 *--------------------------------------
 * File Header (16 Bytes)
 *--------------------------------------
@@ -439,7 +436,7 @@ CS.DOEVENT      sec
 CS.QUIT        	jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .8
 
 				>SYSCALL FreeMem
diff --git a/BIN/FNT2FON.S.txt b/BIN/FNT2FON.S.txt
index 4f0c4c5e..df1b9ba8 100644
--- a/BIN/FNT2FON.S.txt
+++ b/BIN/FNT2FON.S.txt
@@ -14,7 +14,7 @@ NEW
 				.DUMMY
 				.OR ZPBIN
 ZS.START
-ZPPTR1			.BS 2
+ZPPtr1			.BS 2
 ZPInputBufPtr	.BS 2
 ZPInputTblPtr	.BS 2
 ZPInputBMPtr	.BS 2
@@ -75,7 +75,7 @@ CS.INIT
 				bne .2
 
 .99				>LDYA L.MSG.USAGE
-				>SYSCALL Puts
+				>SYSCALL PutS
 				lda #E.SYN
 				sec
 				rts
@@ -365,10 +365,10 @@ CS.RUN.GetChar	lda (ZPInputTblPtr)		Get Char PixW
 .2				pha
 				clc
 				adc ZPCharBufPtr
-				sta ZPPTR1
+				sta ZPPtr1
 				lda #0
 				adc ZPCharBufPtr+1
-				sta ZPPTR1+1
+				sta ZPPtr1+1
 				>LDA.G FON.Header+S.FON.PixH
 				tax
 		
@@ -381,14 +381,14 @@ CS.RUN.GetChar	lda (ZPInputTblPtr)		Get Char PixW
 
 .4				tay
 				lda TWIST,y
-				sta (ZPPTR1)
-				lda ZPPTR1
+				sta (ZPPtr1)
+				lda ZPPtr1
 				clc
 				>ADC.G CharByteW
-				sta ZPPTR1
+				sta ZPPtr1
 				bcc .5
 
-				inc ZPPTR1+1
+				inc ZPPtr1+1
 
 .5				dex
 				bne .3
@@ -411,9 +411,9 @@ CS.RUN.DumpChar	>PUSHW L.MSG.DUMP
 				>SYSCALL PrintF
 
 				lda ZPCharBufPtr
-				sta ZPPTR1
+				sta ZPPtr1
 				lda ZPCharBufPtr+1
-				sta ZPPTR1+1
+				sta ZPPtr1+1
 
 				>LDA.G FON.Header+S.FON.PixH
 
@@ -425,7 +425,7 @@ CS.RUN.DumpChar	>PUSHW L.MSG.DUMP
 
 				ldy #0
 
-.2				lda (ZPPTR1),y
+.2				lda (ZPPtr1),y
 				phy
 				ldx #8
 
@@ -459,13 +459,13 @@ CS.RUN.DumpChar	>PUSHW L.MSG.DUMP
 				>SYSCALL PutChar
 				lda #10
 				>SYSCALL PutChar
-				lda ZPPTR1
+				lda ZPPtr1
 				clc
 				>ADC.G CharByteW
-				sta ZPPTR1
+				sta ZPPtr1
 				bcc .7
 
-				inc ZPPTR1+1
+				inc ZPPtr1+1
 
 .7				pla
 				dec
@@ -478,9 +478,9 @@ CS.RUN.ShiftLChar
 				bmi .9
 
 .1				lda ZPCharBufPtr
-				sta ZPPTR1
+				sta ZPPtr1
 				lda ZPCharBufPtr+1
-				sta ZPPTR1+1
+				sta ZPPtr1+1
 				>LDA.G FON.Header+S.FON.PixH
 				tax
 
@@ -488,15 +488,15 @@ CS.RUN.ShiftLChar
 				pha
 
 .2				pla
-				ora (ZPPTR1)
+				ora (ZPPtr1)
 				pha
-				lda ZPPTR1
+				lda ZPPtr1
 				clc
 				>ADC.G CharByteW
-				sta ZPPTR1
+				sta ZPPtr1
 				bcc .3
 
-				inc ZPPTR1+1
+				inc ZPPtr1+1
 
 .3				dex
 				bne .2
@@ -508,9 +508,9 @@ CS.RUN.ShiftLChar
 				bcs .9
 
 				lda ZPCharBufPtr
-				sta ZPPTR1
+				sta ZPPtr1
 				lda ZPCharBufPtr+1
-				sta ZPPTR1+1
+				sta ZPPtr1+1
 				>LDA.G FON.Header+S.FON.PixH
 				tax
 
@@ -519,19 +519,19 @@ CS.RUN.ShiftLChar
 				clc
 
 .5				dey
-				lda (ZPPTR1),y
+				lda (ZPPtr1),y
 				ror
-				sta (ZPPTR1),y
+				sta (ZPPtr1),y
 				tya
 				bne .5
 
-				lda ZPPTR1
+				lda ZPPtr1
 				clc
 				>ADC.G CharByteW
-				sta ZPPTR1
+				sta ZPPtr1
 				bcc .6
 
-				inc ZPPTR1+1
+				inc ZPPtr1+1
 
 .6				dex
 				bne .4
@@ -549,9 +549,9 @@ CS.RUN.CutRChar	>LDA.G bNoShrink
 				bmi .9
 
 .1				lda ZPCharBufPtr
-				sta ZPPTR1
+				sta ZPPtr1
 				lda ZPCharBufPtr+1
-				sta ZPPTR1+1
+				sta ZPPtr1+1
 				>LDA.G FON.Header+S.FON.PixH
 				tax
 
@@ -562,16 +562,16 @@ CS.RUN.CutRChar	>LDA.G bNoShrink
 				pha
 
 .2				pla
-				ora (ZPPTR1),y
+				ora (ZPPtr1),y
 				pha
 				phy
-				lda ZPPTR1
+				lda ZPPtr1
 				clc
 				>ADC.G CharByteW
-				sta ZPPTR1
+				sta ZPPtr1
 				bcc .3
 
-				inc ZPPTR1+1
+				inc ZPPtr1+1
 
 .3				ply
 				dex
@@ -645,16 +645,16 @@ CS.RUN.StoreChar
 				bcs .99
 
 				lda ZPCharBufPtr
-				sta ZPPTR1
+				sta ZPPtr1
 				lda ZPCharBufPtr+1
-				sta ZPPTR1+1
+				sta ZPPtr1+1
 				>LDA.G FON.Header+S.FON.PixH
 				pha
 
 .2				>LDA.G CharOutByteW
 				tax
 				ldy #0
-.3				lda (ZPPTR1),y
+.3				lda (ZPPtr1),y
 				jsr CS.RUN.WriteByte
 				bcs .9
 
@@ -667,13 +667,13 @@ CS.RUN.StoreChar
 				beq .8
 
 				pha
-				lda ZPPTR1
+				lda ZPPtr1
 				clc
 				>ADC.G CharByteW
-				sta ZPPTR1
+				sta ZPPtr1
 				bcc .2
 
-				inc ZPPTR1+1
+				inc ZPPtr1+1
 				bra .2
 
 .8				clc
diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index 6a01f77e..94a2a2a0 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -213,7 +213,7 @@ CS.RUN.Format	jsr CS.RUN.GetDevDIB
 CS.RUN.CheckOpt	ldy #1
 				lda (ZPPtr1),y
 
-				ldx #OptionList.Cnt-1
+				ldx #OptionList.L-1
 
 .2				cmp OptionList,x
 				beq .3
@@ -914,7 +914,7 @@ MSG.WRITECAT	.CZ "Writing Catalog..."
 FMT.BLANK		.CZ "BLANK%H%H"
 *--------------------------------------
 OptionList		.AS "AaBbDdLlSsTtVv"
-OptionList.cnt	.EQ *-OptionList
+OptionList.L	.EQ *-OptionList
 *--------------------------------------
 Disk2.Default	.DA 280					BlkCnt
 				.DA #35					TrkCnt
diff --git a/BIN/FORTH.S.KW.txt b/BIN/FORTH.S.KW.txt
index 30018bfb..ff12c53c 100644
--- a/BIN/FORTH.S.KW.txt
+++ b/BIN/FORTH.S.KW.txt
@@ -830,7 +830,7 @@ KW.TYPE			>PULLW ZPPtr1			n
 				lda (pPS),y
 				>PUSHA
 				>PUSHW ZPAddrPtr
-				>SYSCALL fputs
+				>SYSCALL FPutS
 
 				clc
 				rts
diff --git a/BIN/GTEST.S.txt b/BIN/GTEST.S.txt
index 662a2df6..913960c9 100644
--- a/BIN/GTEST.S.txt
+++ b/BIN/GTEST.S.txt
@@ -281,7 +281,7 @@ CS.QUIT			lda hFont
 .7				lda hDevGFX
 				beq .8
 
-				>SYSCALL close
+				>SYSCALL Close
 
 .8				clc
 				rts
diff --git a/BIN/HMACMD5.S.txt b/BIN/HMACMD5.S.txt
index d04b93f0..90d26aff 100644
--- a/BIN/HMACMD5.S.txt
+++ b/BIN/HMACMD5.S.txt
@@ -66,7 +66,7 @@ CS.INIT			>LDYA L.LIBCRYPT
 CS.RUN			ldy #S.PS.ARGC
 				lda (pPS),y
 				beq .99
-.0				lda #0
+.10				lda #0
 				pha
 
 .1				inc ArgIndex
@@ -108,7 +108,7 @@ CS.RUN			ldy #S.PS.ARGC
 
 .4				lda ArgIndex
 				sta aOptD,x
-				bra .0
+				bra .10
 
 .8				lda bGotKey
 				beq .99
diff --git a/BIN/LC.S.txt b/BIN/LC.S.txt
index 68f22771..6c53fbc9 100644
--- a/BIN/LC.S.txt
+++ b/BIN/LC.S.txt
@@ -89,7 +89,7 @@ CS.RUN			inc ArgIndex
 				bne .9
 
 				>LDYA ZPPtr1
-				jsr InitSrcDirYA
+				jsr X.InitSrcDirYA
 				bcc CS.RUN
 .99				rts
 *--------------------------------------
@@ -131,7 +131,7 @@ CS.RUN.LOOP		ldy #S.PS.hStdIn
 .1				lda bPause
 				bne CS.RUN.LOOP			Pause...
 *--------------------------------------
-				jsr GetEntry
+				jsr X.GetEntry
 				bcs CS.RUN.LEAVE
 
 				ldy #S.STAT.MODE+1
@@ -157,13 +157,13 @@ CS.RUN.LOOP		ldy #S.PS.hStdIn
 				sec
 .99				rts
 *--------------------------------------
-CS.RUN.NEXT		jsr GetNextEntry
+CS.RUN.NEXT		jsr X.GetNextEntry
 				bcc CS.RUN.LOOP
 
-CS.RUN.LEAVE	jsr LeaveSubDir
+CS.RUN.LEAVE	jsr X.LeaveSubDir
 				bcs .90
 
-				jsr BasePath..
+				jsr X.BasePath..
 
 				jmp CS.RUN.NEXT
 
@@ -209,7 +209,7 @@ CS.RUN.DIR		lda (ZPFileName)
 				bpl .8
 
 				>LDYA ZPFileName	is now lowercase
-				jmp EnterSubDirYA
+				jmp X.EnterSubDirYA
 
 .8				clc
 .9				rts
@@ -283,10 +283,10 @@ CS.RUN.GetNewPath
 CS.DOEVENT		sec
 				rts
 *--------------------------------------
-CS.QUIT			jsr LeaveSubDir
+CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				jsr .7
 
 				lda hSrcFullPath
diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt
index 7f47a241..01da7a9b 100644
--- a/BIN/LS.S.txt
+++ b/BIN/LS.S.txt
@@ -49,8 +49,6 @@ bToFile			.BS 1
 ZPLineBuf		.BS 2
 ZPLineBufPtr	.BS 2
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 * File Header (16 Bytes)
@@ -792,12 +790,12 @@ CS.RUN.LineBufFlush1
 *--------------------------------------
 CS.RUN.LineBufOut
 				lda #C.CR
-				jsr CS.RUN.LineBufCOUT
+				jsr CS.RUN.LineBufCOut
 				bit bToFile
 				bmi .1
 
 				lda #C.LF
-				jsr CS.RUN.LineBufCOUT
+				jsr CS.RUN.LineBufCOut
 
 .1				lda #0
 				sta (ZPLineBufPtr)
@@ -811,7 +809,7 @@ CS.RUN.LineBufOut
 
 				>PUSHYA
 
-				>SYSCALL fputs
+				>SYSCALL FPutS
 				rts
 *--------------------------------------
 CS.RUN.SrcPathOut
@@ -870,8 +868,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				ldy #hFilter
-				lda (pData),y
+				>LDA.G hInclude
 				jsr .7
 
 				lda hPWBuf
diff --git a/BIN/MAN.S.txt b/BIN/MAN.S.txt
index cae1fd1d..fb90ebcc 100644
--- a/BIN/MAN.S.txt
+++ b/BIN/MAN.S.txt
@@ -166,7 +166,7 @@ CS.QUIT			lda hLineBuf
 
 .7				beq .8
 
-				>SYSCALL Freemem
+				>SYSCALL FreeMem
 				
 .8				rts
 *--------------------------------------
diff --git a/BIN/PAK.S.txt b/BIN/PAK.S.txt
index 99ee546d..0cf1d538 100644
--- a/BIN/PAK.S.txt
+++ b/BIN/PAK.S.txt
@@ -97,7 +97,7 @@ CS.RUN			>INC.G ArgIndex
 				bcs .9
 
 				txa
-				>STA.G hExclude
+				>STA.G hIgnore
 				bra CS.RUN
 
 .9				>LDYA L.MSG.USAGE
@@ -591,7 +591,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				ldy #hExclude
+				ldy #hIgnore
 				jsr .7
 
 				ldy #hInclude
diff --git a/BIN/PS.S.txt b/BIN/PS.S.txt
index 4c723d8d..14ee4b57 100644
--- a/BIN/PS.S.txt
+++ b/BIN/PS.S.txt
@@ -87,7 +87,7 @@ CS.RUN			lda #1
 				rts
 
 .10				>LDYA L.MSG0
-				>SYSCALL Puts
+				>SYSCALL PutS
 				ldx Index
 
 .1				lda PS.Table.hPS,x
@@ -213,7 +213,7 @@ CS.RUN.PrintArgs
 				bra .1
 
 .8				>LDYA L.MSG3
-				>SYSCALL Puts
+				>SYSCALL PutS
 .9				rts
 *--------------------------------------
 CS.DOEVENT		sec
diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt
index 6047b801..212dfbfd 100644
--- a/BIN/RPCDUMP.S.txt
+++ b/BIN/RPCDUMP.S.txt
@@ -9,6 +9,7 @@ NEW
 				.INB inc/a2osx.i
 				.INB inc/eth.i
 				.INB inc/libtcpip.i
+				.INB inc/net.tcpip.i			
 *--------------------------------------
 TIMEOUT.MAX		.EQ 40					40*100ms = 4 sec.
 *--------------------------------------
diff --git a/BIN/SPDIAG.S.txt b/BIN/SPDIAG.S.txt
index 6a4fdc3c..0a4013c7 100644
--- a/BIN/SPDIAG.S.txt
+++ b/BIN/SPDIAG.S.txt
@@ -88,7 +88,7 @@ CS.RUN			lda #$C1
 				>PUSHA
 
 				>PUSHBI 2
-				>SYSCALL Printf
+				>SYSCALL PrintF
 				bcs .9
 
 				ldy #$ff
diff --git a/BIN/TELNET.S.txt b/BIN/TELNET.S.txt
index 40927c20..7a47d9b1 100644
--- a/BIN/TELNET.S.txt
+++ b/BIN/TELNET.S.txt
@@ -176,7 +176,7 @@ CS.RUN.OPENSKT	>PUSHBI S.SOCKET.T.STREAM
 				bra .9
 
 .4				>LDYA L.MSG.SKTOK
-				>SYSCALL Puts
+				>SYSCALL PutS
 
 				>LDYAI BUFSIZE
 				>SYSCALL GetMem
diff --git a/BIN/UC.S.txt b/BIN/UC.S.txt
index e6b50136..c3bad14d 100644
--- a/BIN/UC.S.txt
+++ b/BIN/UC.S.txt
@@ -35,8 +35,6 @@ bPause			.BS 1
 bContinue		.BS 1
 bRecurse		.BS 1
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -291,7 +289,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				jsr .7
 
 				lda hSrcFullPath
diff --git a/BIN/UNPAK.S.txt b/BIN/UNPAK.S.txt
index 52aec90b..d8051dfd 100644
--- a/BIN/UNPAK.S.txt
+++ b/BIN/UNPAK.S.txt
@@ -464,7 +464,7 @@ MSG.FILE        .CZ "Extracting File:%s..."
 MSG.OK          .CZ "[OK]"
 MSG.E.IARC      .CZ "\r\nInvalid/corrupt archive"
 MSG.PAK         .CS "PAK"
-MSG.SPINNER     .CS "|/-\"
+MSG.SPINNER     .AS "|/-\"
 *--------------------------------------
                 .DUMMY
                 .OR 0
diff --git a/BIN/USERDEL.S.txt b/BIN/USERDEL.S.txt
index d10083ba..488091b0 100644
--- a/BIN/USERDEL.S.txt
+++ b/BIN/USERDEL.S.txt
@@ -87,7 +87,7 @@ CS.RUN			>LDYAI 256
 				rts
 
 .9				>LDYA L.MSG.INV
-				>SYSCALL Puts
+				>SYSCALL PutS
 				lda #E.IUSR
 				sec
 				rts
diff --git a/BIN/WC.S.txt b/BIN/WC.S.txt
index 8f8dd87a..19a81ae2 100644
--- a/BIN/WC.S.txt
+++ b/BIN/WC.S.txt
@@ -44,8 +44,6 @@ bWord			.BS 1
 bInWord			.BS 1
 bTotal			.BS 1
 
-hFilter			.BS 1
-
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -571,7 +569,7 @@ CS.DOEVENT		sec
 CS.QUIT			jsr X.LeaveSubDir
 				bcc CS.QUIT
 
-				>LDA.G hFilter
+				>LDA.G hInclude
 				beq .1
 
 				>SYSCALL FreeMem
diff --git a/DRV/GRAPPLERP.DRV.S.txt b/DRV/GRAPPLERP.DRV.S.txt
index 912059f2..5a416dbd 100644
--- a/DRV/GRAPPLERP.DRV.S.txt
+++ b/DRV/GRAPPLERP.DRV.S.txt
@@ -291,7 +291,7 @@ DIB				.DA #S.DIB.S.WRITE+S.DIB.S.READ
 				.PS "Grappler+ // Crd"
 				.DA #S.DIB.T.CHAR
 				.DA #0
-				.DA 00
+				.BS 2					Version
 *--------------------------------------
 DCB				.DA #S.DCB.T.COM
 				.DA #0					FLAGS
diff --git a/DRV/SPTAPE.DRV.S.txt b/DRV/SPTAPE.DRV.S.txt
index bcc5964c..02212cb1 100644
--- a/DRV/SPTAPE.DRV.S.txt
+++ b/DRV/SPTAPE.DRV.S.txt
@@ -117,10 +117,10 @@ SP.ScanSlots	lda #$C1
 				beq .7
 				
 				sta DevCnt
-				stz DevId
+				stz DevID
 				
-.3				inc DevId
-				ldx DevId
+.3				inc DevID
+				ldx DevID
 				lda #S.IOCTL.S.GETDIB
 				jsr SP.Call
 				bcs .6
diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt
index cdc29dca..cbda9925 100644
--- a/INC/A2osX.I.txt
+++ b/INC/A2osX.I.txt
@@ -27,48 +27,48 @@ A2osX.ZCALL		.EQ $0000
 * A2osX GLOBAL PAGE
 *  $BC00->$BC0F : Public Vectors
 *--------------------------------------
-A2osX.SYSCALL	.EQ	$BC00
-A2osX.LIBCALL	.EQ	$BC03
-A2osX.ATKCALL	.EQ	$BC06
-A2osX.FPUCALL	.EQ	$BC09
-A2osX.BADCALL	.EQ $BC0C
+A2osX.SYSCALL	.EQ	$1000
+A2osX.LIBCALL	.EQ	$1003
+A2osX.ATKCALL	.EQ	$1006
+A2osX.FPUCALL	.EQ	$1009
+A2osX.BADCALL	.EQ $100C
 *--------------------------------------
-A2osX.SLEEP		.EQ $BC10
+A2osX.SLEEP		.EQ $1010
 *--------------------------------------
 *  $BED0->$BEEF : Public Variables
 *--------------------------------------
-A2osX.SCRNDEVS	.EQ	$BED0				0=console, 1-8=VT100, 9=GFX
-A2osX.ASCREEN	.EQ	$BEDA				Active Screen
-* free BEDB -> BEDF
-A2osX.KVER		.EQ $BEE0
-A2osX.IRQMode	.EQ $BEE3
-A2osX.ATLKSID	.EQ $BEE4
-A2osX.FSID		.EQ $BEE5
-A2osX.CPUTYPE	.EQ $BEE6
-A2osX.CPUSPEED	.EQ $BEE7				WORD, (->255.99 Mhz)
+A2osX.SCRNDEVS	.EQ	$11D0				0=console, 1-8=VT100, 9=GFX
+A2osX.ASCREEN	.EQ	$11DA				Active Screen
 
-A2osX.Z80SLOT	.EQ $BEE9
-A2osX.HWType	.EQ $BEEA
+A2osX.KVER		.EQ $11E0
+A2osX.IRQMode	.EQ $11E3
+A2osX.ATLKSID	.EQ $11E4
+A2osX.FSID		.EQ $11E5
+A2osX.CPUTYPE	.EQ $11E6
+A2osX.CPUSPEED	.EQ $11E7				WORD, (->255.99 Mhz)
+
+A2osX.Z80SLOT	.EQ $11E9
+A2osX.HWType	.EQ $11EA
 A2osX.HWType.UNKNOWN	.EQ 0
 A2osX.HWType.IIe		.EQ 1
 A2osX.HWType.IIc		.EQ 2
 A2osX.HWType.IIgs		.EQ 3
-A2osX.HWSubT	.EQ $BEEB
+A2osX.HWSubT	.EQ $11EB
 A2osX.HWSubT.Enh		.EQ 1
 A2osX.HWSubT.LCCard		.EQ 2
 
-A2osX.TIMER16	.EQ $BEEC				WORD
-A2osX.RANDOM16	.EQ $BEEE				WORD
+A2osX.TIMER16	.EQ $11EC				WORD
+A2osX.RANDOM16	.EQ $11EE				WORD
 *--------------------------------------
 *  $BEF0->$BEFF : Kernel Config Block
 *--------------------------------------
-A2osX.KCONFIG	.EQ $BEF0
-A2osX.HZ		.EQ $BEF0				5/6 for 50/60Hz
-A2osX.TTYDEVS	.EQ $BEF1
-A2osX.F			.EQ $BEF8
+A2osX.KCONFIG	.EQ $11F0
+A2osX.HZ		.EQ $11F0				5/6 for 50/60Hz
+A2osX.TTYDEVS	.EQ $11F1
+A2osX.F			.EQ $11F8
 A2osX.F.CHROOT		.EQ %10000000		ChRooting to /RAMx
 A2osX.F.PMODE		.EQ %01000000		Pre-emptive Mode
-A2osX.S			.EQ $BEF8				$BEF9->$BEFF, 7 slots
+A2osX.S			.EQ $11F8				$BEF9->$BEFF, 7 slots
 A2osX.S.Z80			.EQ $80
 A2osX.S.VXD			.EQ $81
 A2osX.S.ATK			.EQ $82
diff --git a/LIB/LIBTUI.S.CONT.txt b/LIB/LIBTUI.S.CONT.txt
index d854cfd8..54e7c9fe 100644
--- a/LIB/LIBTUI.S.CONT.txt
+++ b/LIB/LIBTUI.S.CONT.txt
@@ -35,7 +35,7 @@ CONT.New		jsr OBJ.Create			A = Class
 *--------------------------------------
 CONT.Insert		>SYSCALL2 GetMemPtr		A = hParent
 				>STYA ZPPtr2
-				
+
 				ldy #S.OBJ.Childs
 
 .1				lda (ZPPtr2),y
@@ -48,26 +48,26 @@ CONT.Insert		>SYSCALL2 GetMemPtr		A = hParent
 				lda #E.OOH
 *				sec
 				rts
-				
-.2				lda hObj 
+
+.2				lda hObj
 				sta (ZPPtr2),y
-				
+
 				ldy #S.OBJ.S
 				lda (ZPPtr2),y
 				ora #S.OBJ.S.bHasChilds
-				sta (ZPPtr2),y				
-				
+				sta (ZPPtr2),y
+
 				ldy #S.OBJ.InnerX
 				lda (ZPPtr2),y
-				
+
 				ldy #S.OBJ.X1
 				clc
 				adc (ZPObjPtr),y
 				sta (ZPObjPtr),y
-				
+
 				ldy #S.OBJ.InnerY
 				lda (ZPPtr2),y
-				
+
 				ldy #S.OBJ.Y1
 				clc
 				adc (ZPObjPtr),y
diff --git a/LIB/LIBTUI.S.IO.txt b/LIB/LIBTUI.S.IO.txt
index 71d5f19d..7ab3dda2 100644
--- a/LIB/LIBTUI.S.IO.txt
+++ b/LIB/LIBTUI.S.IO.txt
@@ -277,7 +277,7 @@ IO.fputs		ldx ZPCtxPtr
 				lda (pPS),y
 				ldy #2
 				sta (pStack),y
-				>SYSCALL fputs
+				>SYSCALL FPutS
 
 				plx
 				stx ZPObjPtr+1
diff --git a/SBIN/INITD.S.txt b/SBIN/INITD.S.txt
index 9c861872..0570a1bb 100644
--- a/SBIN/INITD.S.txt
+++ b/SBIN/INITD.S.txt
@@ -65,7 +65,7 @@ CS.RUN			.DO INITDDBG=1
 				>LDYA L.MSG.START
 				>SYSCALL PutS
 				.FIN
-				
+
 				ldy #S.PS.PID
 				lda (pPS),y
 				cmp #1
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index e61a47d9..6768a97f 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -119,7 +119,7 @@ CS.RUN.AUTH		lda #3
 				bcs .9
 
 				>LDYA L.MSG.CRLF
-				>SYSCALL Puts
+				>SYSCALL PutS
 				bcs .9
 				
 				>PUSHW pData				>PUSHEA.G Password
@@ -282,7 +282,7 @@ CS.RUN.GetLine	>STYA ZPGetLinePtr
 *--------------------------------------
 CS.RUN.printf	>PUSHYA
 				>PUSHBI 0
-				>SYSCALL printf
+				>SYSCALL PrintF
 				rts
 *--------------------------------------
 CS.RUN.DumpFile	>PUSHYA
diff --git a/SHARED/X.CPMVRM.S.txt b/SHARED/X.CPMVRM.S.txt
index c06adc0f..16390574 100644
--- a/SHARED/X.CPMVRM.S.txt
+++ b/SHARED/X.CPMVRM.S.txt
@@ -631,7 +631,7 @@ CS.RUN.CheckOpt	jsr CS.RUN.NextOpt
 				lda (ZPPtr1),y
 				bne .98
 
-				>LDA.G hExclude
+				>LDA.G hIgnore
 				bne .98
 
 				jsr CS.RUN.NextOpt
@@ -641,7 +641,7 @@ CS.RUN.CheckOpt	jsr CS.RUN.NextOpt
 				bcs .99
 
 				txa
-				>STA.G hExclude
+				>STA.G hIgnore
 				bra CS.RUN.CheckOpt
 *--------------------------------------
 .5				>LDA.G index
@@ -710,7 +710,7 @@ CS.QUIT			jsr X.LeaveSubDir
 				ldy #hInclude
 				jsr .7
 
-				ldy #hExclude
+				ldy #hIgnore
 
 .7				lda (pData),y
 .8				beq .9
diff --git a/SHARED/X.FILEENUM.G.txt b/SHARED/X.FILEENUM.G.txt
index cfac6a96..ac59ef82 100644
--- a/SHARED/X.FILEENUM.G.txt
+++ b/SHARED/X.FILEENUM.G.txt
@@ -8,7 +8,7 @@ oDIRENTs		.BS X.MAX.RECURSE*2
 STATBUF			.BS S.STAT
 
 hInclude		.BS 1
-hExclude		.BS 1
+hIgnore			.BS 1
 
 hSrcBasePath	.BS 1
 				.DO X.COPY.TO.DEST=1
diff --git a/SHARED/X.FILEENUM.S.txt b/SHARED/X.FILEENUM.S.txt
index 6f96f3fa..0440e14c 100644
--- a/SHARED/X.FILEENUM.S.txt
+++ b/SHARED/X.FILEENUM.S.txt
@@ -19,7 +19,7 @@ X.MAX.RECURSE	.EQ 8
 *  hSrcBasePath	.BS 1
 *  hDstBasePath	.BS 1				(optional)
 *  hInclude		.BS 1
-*  hExclude		.BS 1
+*  hIgnore		.BS 1
 *--------------------------------------
 * Compare a ZPFileName against hInclude (e.g. '*test?.*')
 * CC : match
@@ -36,7 +36,7 @@ X.IgnoreMatch	sec
 				ldy #hInclude
 				bcc .11
 				
-				iny
+				iny						hIgnore
 				
 .11				lda (pData),y
 				beq	X.FilterMatch.RTS	No filter....exit with passed carry
diff --git a/SYS/KERNEL.S.CTRL.txt b/SYS/KERNEL.S.CTRL.txt
index 2ba4861f..105dc6ac 100644
--- a/SYS/KERNEL.S.CTRL.txt
+++ b/SYS/KERNEL.S.CTRL.txt
@@ -9,7 +9,6 @@ C1				.EQ Mem.MHiMem
 C2				.EQ Mem.XLoMem
 C3				.EQ Mem.XHiMem
 *--------------------------------------
-C4				.EQ GP.CE-GP.CS
 C5				.EQ AUX.S
 *--------------------------------------
 C6				.EQ D1.S
@@ -25,11 +24,6 @@ C8				.EQ E0.S
 				.DO Mem.XLoMem>$2000
 				.LIST ON
 * ERROR:AUX too big
-				.LIST OFF
-				.FIN
-				.DO	C4>$1D0
-				.LIST ON
-* ERROR:GP too big
 				.LIST OFF
 				.FIN
 				.DO D1.S>$1000
diff --git a/SYS/KERNEL.S.DEF.txt b/SYS/KERNEL.S.DEF.txt
index b63e61c1..ff98bdd6 100644
--- a/SYS/KERNEL.S.DEF.txt
+++ b/SYS/KERNEL.S.DEF.txt
@@ -145,8 +145,6 @@ Mem.LastSlot	.EQ $0806
 *--------------------------------------
 * free $1000->$1FFF = $1000 (4096)		Aux
 *--------------------------------------
-A2osX.Main		.EQ $1200
-*--------------------------------------
 K.S.STAT		.EQ $1C00				S.STAT for internal kernel operations
 K.S.EVT			.EQ	$1C40				K.EVT.MAX*S.EVT=4*8=32b
 K.S.IOCTL		.EQ $1C60				9 bytes
@@ -161,7 +159,7 @@ K.Buf256		.EQ $1E00				512 bytes....
 K.IOBuf			.EQ	$1F00				....for ReadDir
 *--------------------------------------
 Mem.MLoMem		.EQ $2000
-Mem.MHiMem		.EQ A2osX.SYSCALL
+Mem.MHiMem		.EQ $BF00
 Mem.XLoMem		.EQ $1000
 Mem.XHiMem		.EQ $A000
 DevMgr.HiMem	.EQ $FFFA				Protect IRQ vectors in Aux LC
diff --git a/SYS/KERNEL.S.GP.txt b/SYS/KERNEL.S.GP.txt
index e3e1af8b..09244fa1 100644
--- a/SYS/KERNEL.S.GP.txt
+++ b/SYS/KERNEL.S.GP.txt
@@ -7,7 +7,7 @@ NEW
 *   X = SYSfnc.Index
 *   Y,A = free for Inline param
 *--------------------------------------
-GP.CS			jmp GP.SysCall
+				jmp GP.SysCall
 *--------------------------------------
 * LIBCALL (AUXLC to AUXLC)
 * Used by user
@@ -436,13 +436,11 @@ GP.IRQ.Exit		stz IRQ.Skip			reset flag
 *--------------------------------------
 *BrkHandler		bra *
 *--------------------------------------
-GP.CE			.BS $BED0-*
-*--------------------------------------
-*  $BED0->$BEEF : Public Variables
+* $BED0->$BEEF : Public Variables
 *--------------------------------------
 				.BS 32
 *--------------------------------------
-*  $BEF0->$BEFF : Kernel Config Block
+* $BEF0->$BEFF : Kernel Config Block
 *--------------------------------------
 				.DA #6					A2osX.HZ=60hz
 				.DA #2					A2osX.TTYDEVS=2
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index 339a249d..232b5af2 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -22,7 +22,7 @@ Kernel.Init2	sei
 
 				>LDYA PAKME.MAIN
 				>STYA ZPInBufPtr
-				>LDYAI A2osX.Main
+				>LDYAI $1000
 				jsr A2osX.Unpak
 
 				>LDYA PAKME.AUX
@@ -66,11 +66,6 @@ Kernel.Init2	sei
 
 .4				sta CLRWRITEAUX
 
-				>LDYA PAKME.GP
-				>STYA ZPInBufPtr
-				>LDYAI A2osX.SYSCALL
-				jsr A2osX.Unpak
-
 				sta SETALTZP
 
 				lda RRAMWRAMBNK2
@@ -639,7 +634,9 @@ DetectZ80		ldx #Z80.300.L
 
 				ldx #Z80.1000.L
 
-.2				lda Z80.1000-1,x
+.2				lda $1000-1,x
+				sta Z80.SAVE-1,x
+				lda Z80.1000-1,x
 				sta $1000-1,x			00000H for Z80
 				dex
 				bne .2
@@ -666,24 +663,21 @@ DetectZ80		ldx #Z80.300.L
 .8				lda ZPPtr1+1
 				and #$0F
 				clc
-.9				rts
-*--------------------------------------
-* Z80 Reserved
-*--------------------------------------
-*Z80CODE		.EQ $300				0F300h
-*Z80STACK		.EQ $3CF				0F3CFh
-*--------------------------------------
-Z80.300			.HS	3200E1						LD (0E100H),A		Back to 6502
 
+.9				php
+				pha
+				
+				ldx #Z80.1000.L
 
-Z80.300.L		.EQ *-Z80.300
-*--------------------------------------
-Z80.1000		.HS	31CFF3				START:	LD SP,0F3CFh		Init Stack
-				.HS	3EFF						LD A,0FFH			Set Flag
-				.HS	320B00						LD (FLAG),A
-				.HS	C300F3						JP 0F300h
-				.HS 00					FLAG:	.DB 0
-Z80.1000.L		.EQ *-Z80.1000
+.90				lda Z80.SAVE-1,x
+				sta $1000-1,x
+				dex
+				bne .90
+				
+				
+				pla
+				plp
+				rts
 *--------------------------------------
 DevMgrInit		>LDYAI MSG.DEV
 				>SYSCALL2 puts
@@ -1438,6 +1432,25 @@ FD.BDEV			.DA #S.FD.T.BDEV
 *--------------------------------------
 FD.BDEV.NAME	.AZ "s1d1"
 *--------------------------------------
+* Z80 Reserved
+*--------------------------------------
+*Z80CODE		.EQ $300				0F300h
+*Z80STACK		.EQ $3CF				0F3CFh
+*--------------------------------------
+Z80.300			.HS	3200E1						LD (0E100H),A		Back to 6502
+
+
+Z80.300.L		.EQ *-Z80.300
+*--------------------------------------
+Z80.1000		.HS	31CFF3				START:	LD SP,0F3CFh		Init Stack
+				.HS	3EFF						LD A,0FFH			Set Flag
+				.HS	320B00						LD (FLAG),A
+				.HS	C300F3						JP 0F300h
+				.HS 00					FLAG:	.DB 0
+Z80.1000.L		.EQ *-Z80.1000
+*--------------------------------------
+Z80.SAVE		.EQ *
+*--------------------------------------
 MAN
 SAVE usr/src/sys/kernel.s.init
 LOAD usr/src/sys/kernel.s
diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt
index 86f5fef5..55a7662a 100644
--- a/SYS/KERNEL.S.MEM.txt
+++ b/SYS/KERNEL.S.MEM.txt
@@ -372,13 +372,13 @@ K.FreeMem.ERR	>PUSHWI .1
 				>PUSHA
 				>PUSHBI 2
 				
-				>SYSCALL2 printf
-*			>DEBUG
+				>SYSCALL2 PrintF
+			>DEBUG
 				lda #E.INVH
 				sec
 				rts
 
-.1				.CZ "Free($%h),PID=%d\r\n"
+.1				.CZ "Free(%h),PID=%d\r\n"
 *--------------------------------------
 K.FreeMem	    tay
 				beq K.FreeMem.ERR		Slot=0, reserved by Kernel
diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt
index 4065efe7..cfcc5a9a 100644
--- a/SYS/KERNEL.S.txt
+++ b/SYS/KERNEL.S.txt
@@ -25,7 +25,6 @@ A2osX.Unpak		>STYA ZPOutBufPtr
 
 PAKME.MAIN		.DA MAIN
 PAKME.AUX		.DA AUX
-PAKME.GP		.DA GP
 PAKME.D1		.DA D1
 PAKME.D2		.DA D2
 PAKME.E0		.DA E0
@@ -33,7 +32,8 @@ PAKME.E0		.DA E0
 MAIN			.DA #0
 				.DA MAIN.S
 
-MAIN.B			.PH A2osX.Main
+MAIN.B			.PH $1000
+				.INB usr/src/sys/kernel.s.gp
 				.INB usr/src/sys/kernel.s.core
 				.INB usr/src/sys/kernel.s.drv
 				.INB usr/src/sys/kernel.s.pft
@@ -65,14 +65,6 @@ AUX.B			.PH Mem.XHiMem
 				.EP
 AUX.S 			.EQ *-AUX.B
 
-GP				.DA #0
-				.DA GP.S
-
-GP.B			.PH A2osX.SYSCALL
-				.INB usr/src/sys/kernel.s.gp
-				.EP
-GP.S			.EQ *-GP.B
-
 D1				.DA #0
 				.DA D1.S
 
@@ -137,7 +129,7 @@ E0.S			.EQ *-E0.B
 
 				.AS "PAKME"				TAG
 				.DA $2000				BIN ORG
-				.DA #6					Chunk Count
+				.DA #5					Chunk Count
 				.DA PAKME.MAIN			Chunks
 
 				.INB usr/src/sys/kernel.s.ctrl