diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index ea003c54..cc2871d2 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/SBIN/BBSD.S.txt b/SBIN/BBSD.S.txt
index 1c5cf753..00cc992f 100644
--- a/SBIN/BBSD.S.txt
+++ b/SBIN/BBSD.S.txt
@@ -7,6 +7,7 @@ NEW
 *--------------------------------------
 				.INB inc/macros.i
 				.INB inc/a2osx.i
+				.INB inc/kernel.i
 				.INB inc/mli.i
 				.INB inc/mli.e.i
 				.INB inc/eth.i
@@ -179,7 +180,10 @@ CS.RUN.INIT		ldx #3
 CS.RUN.CLIENT	>SLEEP					give some time for TCPIP SYN/ACK
 
 				sta hClientSocket
-				>SYSCALL GetMemPtr
+				tax
+				
+				lda FDs.pHI-1,x
+				ldy FDs.pLO-1,x
 				>STYA ZPSktPtr
 
 				>PUSHW L.MSG.INCOMING
@@ -203,8 +207,8 @@ CS.RUN.CLIENT	>SLEEP					give some time for TCPIP SYN/ACK
 				>PUSHBI 1
 				>SYSCALL SPrintF
 
-CS.RUN.CLIENT1	>PUSHEA.G NodBuf+5
-				>PUSHW 0
+CS.RUN.CLIENT1	>PUSHEA.G NodBuf
+				>PUSHWZ
 				>PUSHB hClientSocket
 				>SYSCALL MKNod
 				bcs .9
@@ -223,6 +227,10 @@ CS.RUN.CLIENT1	>PUSHEA.G NodBuf+5
 *				clc
 .9				rts
 *--------------------------------------
+_DEBUG		>LDYA.G CmdBuf
+			>SYSCALL PutS
+			rts
+*--------------------------------------
 CS.DOEVENT		lda (pEvent)
 				bpl .9					is it a TIMER event?
 
@@ -252,6 +260,7 @@ CS.RUN.CONF		>PUSHW L.ETCBBSDCONF
 				>PUSHBI S.FI.T.TXT
 				>PUSHWZ
 				>SYSCALL FOpen
+
 				bcs CS.QUIT.RTS
 
 				sta hFile
@@ -269,9 +278,9 @@ CS.RUN.CONF		>PUSHW L.ETCBBSDCONF
 				>SYSCALL FGetS
 				bcs .8
 
-				tya
+				lda (ZPLinePtr)
 				beq .1
-
+				
 				lda (ZPLinePtr)
 				cmp #'#'
 				beq .1
@@ -311,6 +320,7 @@ CS.RUN.CONF		>PUSHW L.ETCBBSDCONF
 				adc ZPPtr1
 				sta ZPPtr1
 				bcc .6
+
 				inc ZPPtr1+1
 
 .6				lda	(ZPPtr1)
@@ -346,7 +356,7 @@ CS.RUN.CONF.JMP	tya
 				lda #0
 				adc ZPLinePtr+1
 				sta ZPPtr1+1
-				
+
 				jmp (J.KEYWORDS.CONF,x)
 
 CS.RUN.CONF.TCPLISTEN
@@ -358,9 +368,10 @@ CS.RUN.CONF.TCPLISTEN
 .9				rts
 
 CS.RUN.CONF.COMLISTEN
+				clc
 
-.9				clc
-				rts
+
+.9				rts
 CS.RUN.CONF.MSGFILE
 				>PUSHYA
 				>PUSHWZ					Allocate