diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 498af911..b553517c 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt
index 7109fd6a..89a9372f 100644
--- a/BIN/ARP.S.txt
+++ b/BIN/ARP.S.txt
@@ -51,7 +51,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 				
 .9				rts
 *--------------------------------------
-CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG
+CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG
 				>STYA ZPPTR1
 
 				ldy #S.IPCFG.STATUS
@@ -113,16 +113,20 @@ CS.RUN.QUERY	jsr Init.Timeout
 				beq .9
 				bra .1
 				
-.2				ldy #5
-
-.3				>PUSHB.G DST.MAC,y
+.2				ldx #5
+				ldy #DST.MAC+5
+				
+.3				>PUSHB (pData),y
 				dey
+				dex
 				bpl .3
 				
-				ldy #3
+				ldx #3
+				ldy #DST.IP+3
 				
-.4				>PUSHB.G DST.IP,y
+.4				>PUSHB (pData),y
 				dey
+				dex
 				bpl .4
 				
 				>PUSHBI 10
@@ -256,5 +260,5 @@ TimeOut			.BS 1
 DS.END
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/BIN/ARP.S
+SAVE USR/SRC/BIN/ARP.S
 ASM
diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt
index 7a0f9e82..b2a4b88e 100644
--- a/BIN/DNSINFO.S.txt
+++ b/BIN/DNSINFO.S.txt
@@ -57,7 +57,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 
 .9				rts
 *--------------------------------------
-CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
+CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				>STYA ZPPTR1
 				
 				lda (ZPPTR1)			Configured ?
diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt
index 007d1858..73cafbcb 100644
--- a/BIN/NETSTAT.S.txt
+++ b/BIN/NETSTAT.S.txt
@@ -207,5 +207,5 @@ DS.END
 				.ED
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/BIN/NETSTAT.S
+SAVE USR/SRC/BIN/NETSTAT.S
 ASM
diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt
index 3da5465b..dd379ac0 100644
--- a/BIN/PING.S.txt
+++ b/BIN/PING.S.txt
@@ -55,7 +55,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 
 .9				rts
 *--------------------------------------
-CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
+CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				>STYA ZPIPCfgPtr
 				
 				lda (ZPIPCfgPtr)		Configured ?
@@ -392,5 +392,5 @@ DS.END
 				.ED
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/BIN/PING.S
+SAVE USR/SRC/BIN/PING.S
 ASM
diff --git a/BIN/TELNET.S.txt b/BIN/TELNET.S.txt
index 9550ed2a..8ec5cd1c 100644
--- a/BIN/TELNET.S.txt
+++ b/BIN/TELNET.S.txt
@@ -59,7 +59,7 @@ CS.INIT			>LDYA L.LIBTCPIP
 
 .9				rts
 *--------------------------------------
-CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
+CS.RUN			>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				>STYA ZPIPCfgPtr
 				
 				lda (ZPIPCfgPtr)		Configured ?
@@ -319,5 +319,5 @@ DS.END
 				.ED
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/BIN/TELNET.S
+SAVE USR/SRC/BIN/TELNET.S
 ASM
diff --git a/LIB/LIBTCPIP.S.ARP.txt b/LIB/LIBTCPIP.S.ARP.txt
index 09b2cfd3..94a92b98 100644
--- a/LIB/LIBTCPIP.S.ARP.txt
+++ b/LIB/LIBTCPIP.S.ARP.txt
@@ -170,10 +170,8 @@ ARP.IN.REQ		ldy #S.ARP.SPA+3
 				dex
 				bpl .2
 				
-				>PUSHWI S.ARP
-				>PUSHW L.ARP.REP
-				lda IPCFG+S.IPCFG.DevID
-				>SYSCALL write
+				>LDYA L.ARP.REP
+				jsr ARP.Send
 				
 				bra ARP.IN.EXIT
 
@@ -236,10 +234,8 @@ ARP.QUERY.I		jsr ARP.FIND.BY.IP
 				dex
 				bpl .4
 				
-				>PUSHWI S.ARP
-				>PUSHW L.ARP.REQ
-				lda IPCFG+S.IPCFG.DevID
-				>SYSCALL write
+				>LDYA L.ARP.REQ
+				jsr ARP.Send
 				bcs .99
 				
 				lda #K.ARP.PENDING.TTL
@@ -371,6 +367,11 @@ ARP.EXPIRE		>LDYA L.ARP.CACHE
 				bne .1
 				rts
 *--------------------------------------
+ARP.Send		>STYA IOCTL+S.IOCTL.BUFPTR
+				>LDYAI S.ARP
+				>STYA IOCTL+S.IOCTL.BYTECNT
+				jmp FRM.Send.IOCTL
+*--------------------------------------
 MAN
 SAVE USR/SRC/LIB/LIBTCPIP.S.ARP
 LOAD USR/SRC/LIB/LIBTCPIP.S
diff --git a/LIB/LIBTCPIP.S.FRM.txt b/LIB/LIBTCPIP.S.FRM.txt
index ecafcd97..1fb91d2b 100644
--- a/LIB/LIBTCPIP.S.FRM.txt
+++ b/LIB/LIBTCPIP.S.FRM.txt
@@ -341,7 +341,7 @@ FRM.Send		ldx #3
 				dex
 				bpl .1
 				
-				>PUSHW L.IOCTL
+FRM.Send.IOCTL	>PUSHW L.IOCTL
 				>PUSHBI IOCTL.WRITE
 				lda IPCFG+S.IPCFG.DevID
 				>SYSCALL IOCTL
diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt
index 1bf46050..a8c4b971 100644
--- a/SBIN/TELNETD.S.txt
+++ b/SBIN/TELNETD.S.txt
@@ -63,7 +63,7 @@ CS.RUN			jsr Init.Timeout
 				>LDYA L.MSG.TCPWAIT
 				>SYSCALL puts
 				
-.1				>LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG	is TCPIP loaded ?
+.1				>LIBCALL hLIBTCPIP,LIBTCPIP.GETCFG	is TCPIP loaded ?
 				bcs .99
 				>STYA ZPIPCfgPtr