diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 180f147c..f21b364c 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 66ff8c31..bb494609 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index d8a8a78f..a07ef748 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -161,7 +161,7 @@ CS.RUN.OPENSKT	ldx #3
 				sta Socket.Dst.Port+1
 				sta (pData),y
 				
-				>LDYA L.Socket
+				>PUSHW L.Socket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New
 				bcc .2
 				
diff --git a/BIN/TELNET.S.txt b/BIN/TELNET.S.txt
index 24b78a54..2f52786f 100644
--- a/BIN/TELNET.S.txt
+++ b/BIN/TELNET.S.txt
@@ -171,7 +171,6 @@ CS.RUN.LOOP		>SLEEP
 				>PUSHWI BUFSIZE
 				>PUSHW ZPBufPtr
 				>LDA.G hSocket
-
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.Read
 				bcc .1
 
@@ -206,6 +205,7 @@ CS.RUN.LOOP		>SLEEP
 				>PUSHW ZPBufPtr
 				>LDA.G hSocket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.Write
+
 				bcs CS.RUN.SKTERR
 				
 				jmp CS.RUN.LOOP
diff --git a/LIB/LIBTCPIP.S.CFG.txt b/LIB/LIBTCPIP.S.CFG.txt
index 04c3d754..337c16dc 100644
--- a/LIB/LIBTCPIP.S.CFG.txt
+++ b/LIB/LIBTCPIP.S.CFG.txt
@@ -513,11 +513,11 @@ SET.IPCFG.I		>LDYA L.DCB.NIC
 				stz DNS.SOCKET.SP
 				stz DNS.SOCKET.SP+1
 
-				>LDYA L.DNS.SOCKET
+				>PUSHW L.DNS.SOCKET
 				jsr SKT.New
 				bcs .9
 
-				stx hDNSSocket1
+				sta hDNSSocket1
 				
 .6				lda IPCFG+S.IPCFG.DNS2
 				beq .8
@@ -532,11 +532,11 @@ SET.IPCFG.I		>LDYA L.DCB.NIC
 				stz DNS.SOCKET.SP
 				stz DNS.SOCKET.SP+1
 
-				>LDYA L.DNS.SOCKET
+				>PUSHW L.DNS.SOCKET
 				jsr SKT.New
 				bcs .9
 			
-				stx hDNSSocket2
+				sta hDNSSocket2
 				
 .8				clc
 .9				rts
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index b55e3ed0..18e29106 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -9,22 +9,21 @@ AUTO 4,1
 * `hSOCKET skt.new(void *template);`
 * ## ASM
 * **In:**
-* `>LDYA template`
+* `>PUSHW template`
 * `>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New`
 * **Out:**
 * CC: A = hSOCKET
 * CS: A = EC
 *\--------------------------------------
-SKT.New			>STYA ZPTmpPtr1
-				ldy #S.SOCKET.SRC.PORT
+SKT.New			>PULLW ZPTmpPtr1
+				ldy #S.SOCKET.SRC.PORT+1
 				lda (ZPTmpPtr1),y
-				iny
+				dey
 				ora (ZPTmpPtr1),y
 				bne .1
 				
 				jsr GetDynPort
 				
-				ldy #S.SOCKET.SRC.PORT
 				sta (ZPTmpPtr1),y
 				txa
 				iny
@@ -299,10 +298,10 @@ SKT.Accept		jsr SKT.Get.I
 */--------------------------------------
 * # SKT.MkNod
 * ## C
-* `hFD skt.mknod(hSOCKET *s);`
+* `hFD skt.mknod(hSOCKET s);`
 * ## ASM
 * **In:**
-* `>LDYA s`
+* `lda s`
 * `>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.MkNod`
 * **Out:**
 * CC: A = hFD
diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt
index 8505e3c7..85a5d6e6 100644
--- a/LIB/LIBTCPIP.S.TCP.txt
+++ b/LIB/LIBTCPIP.S.TCP.txt
@@ -82,7 +82,7 @@ TCP.IN.JMP.LISTEN
 				stz SKT.Template+S.SOCKET.SO
 				stz SKT.Template+S.SOCKET.TCP.STATUS
 				
-				>LDYA L.SKT.Template
+				>PUSHW L.SKT.Template
 
 				jsr SKT.New				Assign OUTNEXTSEQ
 				bcs .99
diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt
index eab9de88..e2f2e42c 100644
--- a/SBIN/DHCPCLNT.S.txt
+++ b/SBIN/DHCPCLNT.S.txt
@@ -108,7 +108,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 				sec
 				rts
 *--------------------------------------
-CS.RUN			>LDYA L.Socket
+CS.RUN			>PUSHW L.Socket
 
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New
 				bcc	.1
diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt
index d9509c6c..d51120b3 100644
--- a/SBIN/HTTPD.S.txt
+++ b/SBIN/HTTPD.S.txt
@@ -98,7 +98,7 @@ CS.RUN.INIT		ldx #3
 				dex
 				bpl .1
 				
-				>LDYA L.Socket
+				>PUSHW L.Socket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New
 				bcs CS.RUN.RTS
 
diff --git a/SBIN/NFSD.S.txt b/SBIN/NFSD.S.txt
index aa3bb6d5..e243535c 100644
--- a/SBIN/NFSD.S.txt
+++ b/SBIN/NFSD.S.txt
@@ -85,7 +85,7 @@ CS.RUN.INIT		ldx #3
 				dex
 				bpl .1
 				
-				>LDYA L.Socket
+				>PUSHW L.Socket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New
 				bcs .9
 
diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt
index 8bd155b9..ef0df5a9 100644
--- a/SBIN/TELNETD.S.txt
+++ b/SBIN/TELNETD.S.txt
@@ -94,7 +94,7 @@ CS.RUN.INIT		ldx #3
 				dex
 				bpl .1
 				
-				>LDYA L.Socket
+				>PUSHW L.Socket
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.New
 				bcs .9