diff --git a/Floppies/A2OSX.BOOT.po b/Floppies/A2OSX.BOOT.po
index 66c8755d..7b66b90e 100644
Binary files a/Floppies/A2OSX.BOOT.po and b/Floppies/A2OSX.BOOT.po differ
diff --git a/Floppies/A2OSX.BUILD.po b/Floppies/A2OSX.BUILD.po
index 3bbda754..02203efa 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 1ae46345..ea9ca48f 100644
Binary files a/Floppies/A2OSX.SRC.po and b/Floppies/A2OSX.SRC.po differ
diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt
index 978555d4..c25fc0b6 100644
--- a/LIB/LIBTCPIP.S.TCP.txt
+++ b/LIB/LIBTCPIP.S.TCP.txt
@@ -452,30 +452,19 @@ TCP.OUT.SendOptA
 				
 TCP.OUT.SendOptA.1
 				ldy #S.TCP.OPTIONS
+				ora #S.TCP.OPTIONS.ACK
 				sta (ZPFrameOutPtr),y
 				
-				and #S.TCP.OPTIONS.ACK
-				beq .11
-				
 				ldx #3
 				ldy #S.TCP.ACKNUM+3
 				
-.10				lda SKT.TCBCache+S.TCB.OUTACKNUM,x
+.1				lda SKT.TCBCache+S.TCB.OUTACKNUM,x
 				sta (ZPFrameOutPtr),y
 				dey
 				dex
-				bpl .10
-				bra .1
+				bpl .1
 				
-.11				ldy #S.TCP.ACKNUM
-				lda #0
-				
-.12				sta (ZPFrameOutPtr),y
-				iny
-				cpy #S.TCP.ACKNUM+4
-				bne .12
-				
-.1				ldx #3
+				ldx #3
 				ldy #S.TCP.SEQNUM+3
 				
 .2				lda SKT.TCBCache+S.TCB.OUTNEXTSEQ,x
diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt
index d024a8c0..29b0a0c0 100644
--- a/SBIN/HTTPD.S.txt
+++ b/SBIN/HTTPD.S.txt
@@ -44,6 +44,7 @@ L.MSG.TCPIPERR	.DA MSG.TCPIPERR
 L.MSG.SKTERR	.DA MSG.SKTERR
 L.MSG.ABORT		.DA MSG.ABORT
 L.MSG.INCOMING	.DA MSG.INCOMING
+L.HTTP.200OK	.DA HTTP.200OK
 				.DA 0				
 *--------------------------------------
 CS.INIT			>LDYA L.LIBTCPIP
@@ -112,7 +113,7 @@ CS.RUN.INIT		ldx #3
 				
 				beq .3
 				
-*				jsr CS.RUN.CLIENT
+				jsr CS.RUN.CLIENT
 				
 .3				ldy #SktIndex
 				lda (pData),y
@@ -160,6 +161,7 @@ CS.RUN.SERVER	ldy #hSrvSocket
 				
 .2				pla
 				sta (pData),y
+				sta .4+1
 				
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.GetA
 				>STYA ZPSktPtr
@@ -172,12 +174,16 @@ CS.RUN.SERVER	ldy #hSrvSocket
 				dex
 				bpl .3
 				
+.4				lda #$ff
+				>PUSHA
+				
 				>LDYA L.MSG.INCOMING
 				>SYSCALL CPrintFYA
 .8				clc
 .9				rts
 *--------------------------------------
-CS.RUN.CLIENT	>PUSHA					hSocket
+CS.RUN.CLIENT	sta hClntSocket
+				>PUSHA					hSocket
 				>PUSHWI UsrBuf256
 				>PUSHWI 256
 				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.GetS
@@ -186,7 +192,10 @@ CS.RUN.CLIENT	>PUSHA					hSocket
 				>LDYAI UsrBuf256
 				>SYSCALL CPrintFYA
 				
-
+				>PUSHB hClntSocket
+				>PUSHW L.HTTP.200OK
+				>LIBCALL hLIBTCPIP,LIBTCPIP.SKT.PutS
+				
 .1				clc
 				rts
 *--------------------------------------
@@ -233,13 +242,16 @@ Wait.TimeOut	sec
 CS.END
 *--------------------------------------
 LIBTCPIP		>PSTR "libtcpip.o"
-MSG.TCPWAIT		>CSTR "HTTPD:Waiting for TCP/IP initializing...\n"
-MSG.INITOK		>CSTR "HTTPD:Init Ok, Listening.\n"
-MSG.TCPIPERR	>CSTR "HTTPD:TCP/IP Not initialized properly\n"
-MSG.SKTERR		>CSTR "HTTPD:Listen Error\n"
-MSG.ABORT		>CSTR "HTTPD:User Aborted\n"
-MSG.INCOMING	>CSTR "HTTPD:Incoming Connection From : %d.%d.%d.%d\n"	
+MSG.TCPWAIT		>CSTR "HTTPD:Waiting for TCP/IP initializing...\r\n"
+MSG.INITOK		>CSTR "HTTPD:Init Ok, Listening.\r\n"
+MSG.TCPIPERR	>CSTR "HTTPD:TCP/IP Not initialized properly\r\n"
+MSG.SKTERR		>CSTR "HTTPD:Listen Error\r\n"
+MSG.ABORT		>CSTR "HTTPD:User Aborted\r\n"
+MSG.INCOMING	>CSTR "HTTPD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n"
 hLIBTCPIP		.BS 1
+hClntSocket		.BS 1
+*--------------------------------------
+HTTP.200OK		>PSTR "HTTP/1.1 200 OK\r\n"
 *--------------------------------------
 Socket			.DA #S.SOCKET.SOCK.STREAM
 				.DA #S.SOCKET.SO.ACCEPTCONN