diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 4455bbdf..ded14c77 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index 26ea6ed2..c3d11bbd 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt
index 4c1e0566..d2335b2f 100644
--- a/BIN/ARP.S.txt
+++ b/BIN/ARP.S.txt
@@ -42,13 +42,14 @@ L.MSG2			.DA MSG2
 *--------------------------------------
 CS.INIT			>LDYA L.LIBTCPIP
 				>SYSCALL LoadLib.YA
+				bcs .9
 				sta hLIBTCPIP
 				
 				lda (pPs)
 				ora #S.PS.F.EVENT		Now accept events
 				sta (pPs)
 				clc	
-				rts
+.9				rts
 *--------------------------------------
 CS.RUN			ldy #S.PS.ARGC
 				lda (pPs),y
@@ -180,8 +181,8 @@ Wait.TimeOut	sec
 .9				rts
 *--------------------------------------
 CS.END
-LIBTCPIP		>PSTR "libtcpip.o"
-SSCANF.IP		>PSTR "%d.%d.%d.%d"
+LIBTCPIP		>CSTR "libtcpip.o"
+SSCANF.IP		>CSTR "%d.%d.%d.%d"
 MSG0			>CSTR "STS TTL   MAC Address       IP Address\r\n"
 MSG1			>CSTR "$%h %5D %h:%h:%h:%h:%h:%h %d.%d.%d.%d\r\n"
 MSG2			>CSTR "%d.%d.%d.%d is at %h:%h:%h:%h:%h:%h\r\n"
diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt
index 7ccf23df..a2f06990 100644
--- a/BIN/DNSINFO.S.txt
+++ b/BIN/DNSINFO.S.txt
@@ -145,7 +145,7 @@ CS.END
 LIBTCPIP		>CSTR "libtcpip.o"
 SSCANF.IP		>CSTR "%d.%d.%d.%d"
 MSG0			>CSTR "STS TR.ID Hostname                         IP Address      TTL\r\n"
-MSG1			>CSTR "$%h $%H %32S %03d.%03d.%03d.%03d %L\r\n"
+MSG1			>CSTR "$%h $%H %32s %03d.%03d.%03d.%03d %L\r\n"
 hLIBTCPIP		.BS 1
 
 IP				.BS 4
diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index c87763bd..b5f613e2 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -324,8 +324,8 @@ CS.END
 LIBTCPIP		>CSTR "libtcpip.o"
 MSG.IPKO		>CSTR "TCP/IP Not Loaded/Configured.\r\n"
 MSG.USAGE		>CSTR "Usage : PING <ip|host>\r\n"
-MSG.UNKNOWN		>CSTR "%S: Unknown host\r\n"
-MSG.HOSTOK		>CSTR "PING %d.%d.%d.%d (%S)\r\n"
+MSG.UNKNOWN		>CSTR "%s: Unknown host\r\n"
+MSG.HOSTOK		>CSTR "PING %d.%d.%d.%d (%s)\r\n"
 MSG.SKTKO		>CSTR "Failed to Open Socket.\r\n"
 MSG.UNREACH		>CSTR "%d.%d.%d.%d: TimeOut/Host unreachable\r\n"
 MSG.REPLY		>CSTR "32 bytes from %d.%d.%d.%d, icmp_seq=%D, ttl=%d, time=%D ms\r\n"
diff --git a/LIB/LIBTCPIP.S.HST.txt b/LIB/LIBTCPIP.S.HST.txt
index bf3a97fb..4dc1e3bf 100644
--- a/LIB/LIBTCPIP.S.HST.txt
+++ b/LIB/LIBTCPIP.S.HST.txt
@@ -23,17 +23,15 @@ HST.ScanIP		stz HST.IP
 				lda (ZPPtrDNS)
 				beq .9
 				
-				ldy #0
+				ldy #$ff
 				
 .1				ldx #0
 				stx HST.DecStr
 				
-.2				tya
-				cmp (ZPPtrDNS)
+.2				iny
+				lda (ZPPtrDNS),y
 				beq .4
 				
-				iny
-				lda (ZPPtrDNS),y
 				cmp #'.'
 				beq .3
 				
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index 1c21b65d..df874e3d 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -173,7 +173,7 @@ SKT.CloseA		and #$7f
 				adc #S.SOCKET.HQ
 				tax
 				pla
-				inx
+				inc
 				cmp #S.SOCKET.HQ.MAX
 				beq .2
 				
@@ -183,6 +183,8 @@ SKT.CloseA		and #$7f
 				sta (ZPPtrSKT),y
 				
 				txa
+				tay
+				lda (ZPPtrSKT),y
 				>SYSCALL FreeMem.A
 				bra .1