diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 470add5d..7c71f2fa 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/GTEST.S.txt b/BIN/GTEST.S.txt
index ce320bc0..e2a10df8 100644
--- a/BIN/GTEST.S.txt
+++ b/BIN/GTEST.S.txt
@@ -105,7 +105,7 @@ CS.RUN			jsr GFX.Open
 
 				>LDYA L.CB.Apple
 				jsr GFX.Write.YA
-				
+
 				lda hFontB
 				sta CB.TEXTB+S.CB.hFont
 				>LDYA L.MESSAGEB
diff --git a/BIN/HTTPGET.S.txt b/BIN/HTTPGET.S.txt
index 05534f22..886f0fe3 100644
--- a/BIN/HTTPGET.S.txt
+++ b/BIN/HTTPGET.S.txt
@@ -470,6 +470,7 @@ CS.RUN.RESPONSE jsr Init.TimeOut
 				bcc .2
 				
 				cmp #E.NODATA
+			beq .1	
 				bne .8
 				
 				lda TimeOut
diff --git a/DRV/DHGR.DRV.S.OSD.txt b/DRV/DHGR.DRV.S.OSD.txt
index e1a2d6a0..bdf2a9ef 100644
--- a/DRV/DHGR.DRV.S.OSD.txt
+++ b/DRV/DHGR.DRV.S.OSD.txt
@@ -570,8 +570,10 @@ OSD.YAMultX		stx GBYTE
 *--------------------------------------
 CB.Update		sta CLRWRITEAUX
 
-				ldx CBX.Cache
-				ldy CBX.CmdLen,x
+				lda CBX.Cache
+				lsr
+				tax
+				ldy CBX.CmdLen-1,x
 
 .1				lda CBX.Cache,y
 				sta (ZPCmdPtr),y
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index 2965849c..3090e54d 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -463,7 +463,7 @@ WRITE			>STYA ZPIOCTL			NON STANDARD
 				jmp (J.Cmds-2,x)
 
 .2				sta SETWRITEAUX
-			>DEBUG
+
 				and #$7f
 				sta CBX.Cache
 
diff --git a/INC/LIBTCPIP.I.txt b/INC/LIBTCPIP.I.txt
index 4939cdc9..d9f23c28 100644
--- a/INC/LIBTCPIP.I.txt
+++ b/INC/LIBTCPIP.I.txt
@@ -151,8 +151,8 @@ S.SOCKET.REM.PORT	.EQ S.FD.DSOCK+14
 * Datagram type Queue
 * Seq Packet type Queue
 *--------------------------------------
-S.SOCKET.HQ.HEAD	.EQ S.FD.DSOCK+16
-S.SOCKET.HQ.TAIL	.EQ S.FD.DSOCK+17
+S.SOCKET.HQ.TAIL	.EQ S.FD.DSOCK+16
+S.SOCKET.HQ.HEAD	.EQ S.FD.DSOCK+17
 S.SOCKET.HQ			.EQ S.FD.DSOCK+18
 S.SOCKET.HQ.MAX			.EQ 14				14 hMem (frames)
 *--------------------------------------
diff --git a/LIB/LIBGUI.S.CUR.txt b/LIB/LIBGUI.S.CUR.txt
index 691dadfc..4b921cbf 100644
--- a/LIB/LIBGUI.S.CUR.txt
+++ b/LIB/LIBGUI.S.CUR.txt
@@ -102,7 +102,6 @@ DrawCursor.I	>LDYA L.SCR
 				jsr OBJ.Get
 
 				>LDYA L.CUR.CB
-			>DEBUG
 				jsr CLIP.YA
 				bcs .9
 			
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index 26958f29..0124a30f 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -290,28 +290,7 @@ SKT.Accept		>SYSCALL2 GetMemPtr
 				and #S.SOCKET.O.ACCEPTCONN
 				beq .99
 
-				ldy #S.SOCKET.HQ.TAIL
-				lda (ZPPtrSKT),y
-				ldy #S.SOCKET.HQ.HEAD
-				cmp (ZPPtrSKT),y
-				beq .9					CS
-
-				pha
-				inc
-				cmp #S.SOCKET.HQ.MAX
-				bne .1
-
-				lda #0
-
-.1				ldy #S.SOCKET.HQ.TAIL
-				sta (ZPPtrSKT),y
-				pla
-				clc
-				adc #S.SOCKET.HQ
-				tay
-				lda (ZPPtrSKT),y
-				clc
-				rts
+				jmp SKT.GetFromQueue
 
 .99				lda #ERR.SKT.BAD
 				sec
@@ -355,29 +334,9 @@ SKT.shutdown.LISTEN
 SKT.shutdown.RAW
 SKT.shutdown.DGRAM
 SKT.shutdown.SEQPKT
-.1				ldy #S.SOCKET.HQ.TAIL
-				lda (ZPPtrSKT),y
-				ldy #S.SOCKET.HQ.HEAD
-				cmp (ZPPtrSKT),y
-				beq .3					No frame in Queue, close..
-
-				pha						save tail...
-				clc
-				adc #S.SOCKET.HQ
-				tax
-				pla
-				inc
-				cmp #S.SOCKET.HQ.MAX
-				bne .2
-
-				lda #0
-
-.2				ldy #S.SOCKET.HQ.TAIL
-				sta (ZPPtrSKT),y
-
-				txa
-				tay
-				lda (ZPPtrSKT),y
+.1				jsr SKT.GetFromQueue
+				bcs .3
+				
 				>SYSCALL2 FreeMem
 				bra .1
 
@@ -872,28 +831,8 @@ SKT.Recv		clc
 				jsr SKT.CheckTCP
 				bcs .91
 
-.10				ldy #S.SOCKET.HQ.TAIL
-				lda (ZPPtrSKT),y
-				tax
-
-				ldy #S.SOCKET.HQ.HEAD
-				cmp (ZPPtrSKT),y
-				beq .90
-
-				inc
-				cmp #S.SOCKET.HQ.MAX
-				bne .1
-
-				lda #0
-
-.1				ldy #S.SOCKET.HQ.TAIL
-				sta	(ZPPtrSKT),y
-
-				txa
-				clc
-				adc #S.SOCKET.HQ
-				tay
-				lda (ZPPtrSKT),y
+.10				jsr SKT.GetFromQueue
+				bcs .90
 				
 				plp						if CS, RecvFrom
 				bcc .9					Exit with CC and A=hFrame
@@ -1273,6 +1212,33 @@ SKT.FindMatchingLocRem
 *				sec
 				rts
 *--------------------------------------
+SKT.GetFromQueue
+				ldy #S.SOCKET.HQ.TAIL
+				lda (ZPPtrSKT),y
+				iny						#S.SOCKET.HQ.HEAD
+				cmp (ZPPtrSKT),y
+				beq .9					CS
+
+				pha
+				inc
+				cmp #S.SOCKET.HQ.MAX
+				bne .1
+
+				lda #0
+
+.1				dey						#S.SOCKET.HQ.TAIL
+				sta (ZPPtrSKT),y
+
+				pla
+				clc
+				adc #S.SOCKET.HQ
+				tay
+				lda (ZPPtrSKT),y
+
+*				clc
+
+.9				rts
+*--------------------------------------
 SKT.AddToQueueA pha
 				ldy #S.SOCKET.HQ.HEAD
 				lda (ZPPtrSKT),y
@@ -1283,11 +1249,11 @@ SKT.AddToQueueA pha
 
 				lda #0
 
-.1				ldy #S.SOCKET.HQ.TAIL
+.1				dey						#S.SOCKET.HQ.TAIL
 				cmp (ZPPtrSKT),y
 				beq .9					Queue full!!
 
-				ldy #S.SOCKET.HQ.HEAD
+				iny						#S.SOCKET.HQ.HEAD
 				sta (ZPPtrSKT),y
 				txa
 				clc