diff --git a/A2OSX.BUILD.po b/A2OSX.BUILD.po
index c0ff60bd..034555b0 100644
Binary files a/A2OSX.BUILD.po and b/A2OSX.BUILD.po differ
diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po
index 74771707..a02fc646 100644
Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ
diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt
index 4aac8a2e..c1a51561 100644
--- a/LIB/LIBBLKDEV.S.txt
+++ b/LIB/LIBBLKDEV.S.txt
@@ -507,5 +507,5 @@ VolDirHdr.TB	.BS 2					Total Blocks
 VolDirHdr.size	.EQ *-VolDirHdr
 *--------------------------------------
 MAN
-SAVE LIB/LIBBLKDEV.S
+SAVE /A2OSX.SRC/LIB/LIBBLKDEV.S
 ASM
diff --git a/LIB/LIBCRYPT.S.txt b/LIB/LIBCRYPT.S.txt
index e99c554a..036b90f4 100644
--- a/LIB/LIBCRYPT.S.txt
+++ b/LIB/LIBCRYPT.S.txt
@@ -514,5 +514,5 @@ MD5.K			.HS 78A46AD7.56B7C7E8.DB702024.EECEBDC1
 MD5.DIGITS		.AS "0123456789ABCDEF"
 *--------------------------------------
 MAN
-SAVE LIB/LIBCRYPT.S
+SAVE /A2OSX.SRC/LIB/LIBCRYPT.S
 ASM
diff --git a/LIB/LIBGFX.S.txt b/LIB/LIBGFX.S.txt
index 84a7b037..c757c348 100644
--- a/LIB/LIBGFX.S.txt
+++ b/LIB/LIBGFX.S.txt
@@ -113,5 +113,5 @@ PAT.Arrow		.DA #S.BM.F.BBP1
 				.DA 0
 *--------------------------------------
 MAN
-SAVE LIB/LIBGFX.S
+SAVE /A2OSX.SRC/LIB/LIBGFX.S
 ASM
diff --git a/LIB/LIBMATH.S.txt b/LIB/LIBMATH.S.txt
index fd7f4bfc..8f9fca16 100644
--- a/LIB/LIBMATH.S.txt
+++ b/LIB/LIBMATH.S.txt
@@ -50,5 +50,5 @@ LIB.UNLOAD		clc
 
 *--------------------------------------
 MAN
-SAVE LIB/LIBMATH.S
+SAVE /A2OSX.SRC/LIB/LIBMATH.S
 ASM
diff --git a/LIB/LIBPAK.S.txt b/LIB/LIBPAK.S.txt
index dae840fd..e5fee811 100644
--- a/LIB/LIBPAK.S.txt
+++ b/LIB/LIBPAK.S.txt
@@ -649,5 +649,5 @@ PakStat			.BS S.PAKSTAT
 *--------------------------------------
 UnPak.BitMask	.HS 8040201008040201
 MAN
-SAVE LIB/LIBPAK.S
+SAVE /A2OSX.SRC/LIB/LIBPAK.S
 ASM
diff --git a/LIB/LIBTCPIP.S.ARP.txt b/LIB/LIBTCPIP.S.ARP.txt
index be68dd5c..038cfd98 100644
--- a/LIB/LIBTCPIP.S.ARP.txt
+++ b/LIB/LIBTCPIP.S.ARP.txt
@@ -356,6 +356,6 @@ ARP.EXPIRE		>LDYA L.ARP.CACHE
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.ARP
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.ARP
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.CFG.txt b/LIB/LIBTCPIP.S.CFG.txt
index fd997f94..47657119 100644
--- a/LIB/LIBTCPIP.S.CFG.txt
+++ b/LIB/LIBTCPIP.S.CFG.txt
@@ -116,6 +116,6 @@ GET.IPCFG		>LDYA L.IPCFG
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.CFG
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.CFG
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.DNS.txt b/LIB/LIBTCPIP.S.DNS.txt
index ebbf3cc2..124f5a18 100644
--- a/LIB/LIBTCPIP.S.DNS.txt
+++ b/LIB/LIBTCPIP.S.DNS.txt
@@ -540,6 +540,6 @@ DNS.PSTR2DNS	lda (ZPPtrDNS)
 				rts				
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.DNS
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.DNS
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.FRM.txt b/LIB/LIBTCPIP.S.FRM.txt
index d0cbebf6..3aa1f11e 100644
--- a/LIB/LIBTCPIP.S.FRM.txt
+++ b/LIB/LIBTCPIP.S.FRM.txt
@@ -303,6 +303,6 @@ FRM.Retry		ldx FRM.QUEUE.Tail
 .8				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.FRM
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.FRM
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.HST.txt b/LIB/LIBTCPIP.S.HST.txt
index 40e5052e..5b5c027f 100644
--- a/LIB/LIBTCPIP.S.HST.txt
+++ b/LIB/LIBTCPIP.S.HST.txt
@@ -119,6 +119,6 @@ HST.Dec2Hex		ldy HST.DecStr
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.HST
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.HST
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.ICMP.txt b/LIB/LIBTCPIP.S.ICMP.txt
index 8adc6add..36c3cd0d 100644
--- a/LIB/LIBTCPIP.S.ICMP.txt
+++ b/LIB/LIBTCPIP.S.ICMP.txt
@@ -152,6 +152,6 @@ ICMP.ComputeChecksum
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.ICMP
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.ICMP
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.IP.txt b/LIB/LIBTCPIP.S.IP.txt
index 3ef8b09b..1e5ccc55 100644
--- a/LIB/LIBTCPIP.S.IP.txt
+++ b/LIB/LIBTCPIP.S.IP.txt
@@ -175,6 +175,6 @@ IP.SetDestMAC	ldy #S.IP.DST
 .99				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.IP
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.IP
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index 38532f91..39c7515c 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -1043,7 +1043,20 @@ SKT.GetDataFromSktOut
 				sta ZPTmpPtr2+1
 				bra .1
 
-.8				clc
+.8				lda SKT.TCBCache+S.TCB.SEQNUM+3
+				clc
+				adc ZPDataOutLen
+				sta SKT.TCBCache+S.TCB.SEQNUM+3
+				
+				lda SKT.TCBCache+S.TCB.SEQNUM+2
+				adc ZPDataOutLen+1
+				sta SKT.TCBCache+S.TCB.SEQNUM+2
+				bcc .80
+				inc SKT.TCBCache+S.TCB.SEQNUM+1
+				bne .80
+				inc SKT.TCBCache+S.TCB.SEQNUM
+				
+.80				clc
 				rts
 *--------------------------------------
 * From TCP.IN
@@ -1260,6 +1273,6 @@ SKT.CopyDataInToOut
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.SKT
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.SKT
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt
index e43da101..239c81a7 100644
--- a/LIB/LIBTCPIP.S.TCP.txt
+++ b/LIB/LIBTCPIP.S.TCP.txt
@@ -429,13 +429,13 @@ TCP.OUT.SendOpt	sta .1+1
 				>LDYAI 0
 				jsr TCP.NewFrame
 				bcs TCP.OUT.9				
-				
-.1				lda #$ff
 
+.1				lda #$ff
+				
 TCP.OUT.Send	ldy #S.TCP.OPTIONS
 				sta (ZPFrameOutPtr),y
 				bit #S.TCP.OPTIONS.ACK
-				bne .1
+*				beq .1
 				
 				ldx #3
 				ldy #S.TCP.ACK.NUMBER+3
@@ -449,7 +449,7 @@ TCP.OUT.Send	ldy #S.TCP.OPTIONS
 .1				ldx #3
 				ldy #S.TCP.SEQ.NUMBER+3
 				
-.2				lda SKT.TCBCache+S.TCB.NEXTSEQ,x
+.2				lda SKT.TCBCache+S.TCB.SEQNUM,x
 				sta (ZPFrameOutPtr),y
 				dey
 				dex
@@ -627,6 +627,6 @@ TCP.ComputeChecksum
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.TCP
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.TCP
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.UDP.txt b/LIB/LIBTCPIP.S.UDP.txt
index 5012a7f4..830dd121 100644
--- a/LIB/LIBTCPIP.S.UDP.txt
+++ b/LIB/LIBTCPIP.S.UDP.txt
@@ -164,6 +164,6 @@ UDP.ComputeChecksum
 				rts
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S.UDP
-LOAD LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S.UDP
+LOAD /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt
index 3b3f0e4b..c30de0dc 100644
--- a/LIB/LIBTCPIP.S.txt
+++ b/LIB/LIBTCPIP.S.txt
@@ -301,5 +301,5 @@ IP.ID			.BS 2
 IP.CHECKSUM		.BS 4
 *--------------------------------------
 MAN
-SAVE LIB/LIBTCPIP.S
+SAVE /A2OSX.SRC/LIB/LIBTCPIP.S
 ASM
diff --git a/SBIN/INSDRV.S.txt b/SBIN/INSDRV.S.txt
index 6360ba32..09eab6aa 100644
--- a/SBIN/INSDRV.S.txt
+++ b/SBIN/INSDRV.S.txt
@@ -76,5 +76,5 @@ MSG.HELP		>CSTR "Usage: insdrv file.drv <args>\r\n"
 MSG.LOAD		>CSTR "INSDRV:Loading %S...\r\n"
 *--------------------------------------
 MAN
-SAVE /A2OSX.BUILD/SBIN/INSDRV.S
+SAVE /A2OSX.SRC/SBIN/INSDRV.S
 ASM
diff --git a/SBIN/TCPIP.S.txt b/SBIN/TCPIP.S.txt
index 0ebcb4be..c9606aba 100644
--- a/SBIN/TCPIP.S.txt
+++ b/SBIN/TCPIP.S.txt
@@ -59,31 +59,22 @@ CS.INIT			>LDYA L.LIBTCPIP
 				lda IPCFG+S.IPCFG.HOSTNAME
 				bne .4
 
-				ldy #0
+				ldy DefaultHostName
+				
 .2				lda DefaultHostName,y
-				beq .3
 				sta IPCFG+S.IPCFG.HOSTNAME,y
-				iny
-				bne .2
+				dey
+				bpl .2
 			
 .3				lda A2osX.TIMER16
 				jsr A2CharAX
-				sta IPCFG+S.IPCFG.HOSTNAME,y
-				iny
-				txa
-				sta IPCFG+S.IPCFG.HOSTNAME,y
-				iny
+				sta IPCFG+S.IPCFG.HOSTNAME+7
+				stx IPCFG+S.IPCFG.HOSTNAME+8
 				
 				lda A2osX.TIMER16+1
 				jsr A2CharAX
-				sta IPCFG+S.IPCFG.HOSTNAME,y
-				iny
-				txa
-				sta IPCFG+S.IPCFG.HOSTNAME,y
-				iny
-				
-				lda #0
-				sta IPCFG+S.IPCFG.HOSTNAME,y
+				sta IPCFG+S.IPCFG.HOSTNAME+9
+				stx IPCFG+S.IPCFG.HOSTNAME+10
 				
 .4				>PUSHW L.IPCFG
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SET.IPCFG
@@ -201,7 +192,7 @@ MSG.CFG.OK		>CSTR "OK.\r\n"
 HOSTNAME		>PSTR "${A2OSX}ETC/HOSTNAME"
 TCPIP.CONF		>PSTR "${A2OSX}ETC/TCPIP.CONF"
 HOSTS			>PSTR "${A2OSX}ETC/HOSTS"
-DefaultHostName	>CSTR "a2osx-"
+DefaultHostName	>PSTR "a2osx-XXXX"
 CFG.Keywords	>PSTR "DOMAIN"
 				>PSTR "IP"
 				>PSTR "MASK"
diff --git a/SYS/KERNEL.S.LIB.txt b/SYS/KERNEL.S.LIB.txt
index 08ed7475..2ebd6d78 100644
--- a/SYS/KERNEL.S.LIB.txt
+++ b/SYS/KERNEL.S.LIB.txt
@@ -10,7 +10,7 @@ AUTO 6
 * out :
 *   A = hMem To loaded LIB
 *--------------------------------------
-K.LoadLibYA		>STYA K.LoadLib.Name	save libname for K.FileSearch
+K.LoadLibYA		>STYA K.LoadLib.Name	SAVE /A2OSX.SRC/LIBname for K.FileSearch
 				>LDYAI ENV.LIB			push ENVNAME=LIB
 				>SYSCALL GetEnvYA	get value for ENV=LIB
 				bcs .99