diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 1dfc53fa..9e145c2b 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt
index 7bb44237..0521ad37 100644
--- a/LIB/LIBTCPIP.S.SKT.txt
+++ b/LIB/LIBTCPIP.S.SKT.txt
@@ -499,12 +499,12 @@ SKT.GetDataFromSktIn
 
 .80				jsr SKT.StoreTCB
 
-*				lda #S.TCP.OPTIONS.ACK
-*				jsr TCP.OUT.SendOptA
+				lda #S.TCP.OPTIONS.ACK
+				jsr TCP.OUT.SendOptA
 				
-				jsr TCP.SetSocketTCPO.ACK
+*				jsr TCP.SetSocketTCPO.ACK
 
-				jsr TCP.OUT.I			SKT.GetTCB already called 
+*				jsr TCP.OUT.I			SKT.GetTCB already called 
 
 				>LDYA ZPDataInLen
 				clc
diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt
index c8be5ab4..2852b8f4 100644
--- a/LIB/LIBTCPIP.S.TCP.txt
+++ b/LIB/LIBTCPIP.S.TCP.txt
@@ -432,11 +432,8 @@ TCP.SENDCLOSE	ldx #0
 				plx
 				phx
 				lda SKT.TABLE,x
-				>SYSCALL2 freemem
-				
-				plx
-				phx
 				stz SKT.TABLE,x
+				>SYSCALL2 freemem
 				
 .8				plx
 				inx
diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt
index b92c5307..5745eaef 100644
--- a/SBIN/GETTY.S.txt
+++ b/SBIN/GETTY.S.txt
@@ -9,7 +9,7 @@ NEW
 				.INB INC/A2OSX.I
 				.INB INC/NET.TELNET.I
 *--------------------------------------
-TIMEOUT.MAX		.EQ 20					2 sec.
+TIMEOUT.MAX		.EQ 40					4 sec.
 IAC.BUF.MAX		.EQ 32
 *--------------------------------------
 				.DUMMY
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index 9da87b95..8c7996c3 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -120,7 +120,7 @@ CS.RUN.AUTH		>LDYA L.LIBCRYPT
 				clc
 				jsr CS.RUN.GetLine
 				bcs .9
-				
+
 				>PUSHWZ			Dry Run
 				>LDYA ZPGetLinePtr
 				>SYSCALL GetPWName
@@ -136,7 +136,7 @@ CS.RUN.AUTH		>LDYA L.LIBCRYPT
 				sec
 				jsr CS.RUN.GetLine
 				bcs .9
-				
+
 				>PUSHBI 0
 				>LDYA L.MSG.CRLF
 				>SYSCALL printf
diff --git a/SYS/KERNEL.S.DEF.txt b/SYS/KERNEL.S.DEF.txt
index 2140c599..0de9b9c9 100644
--- a/SYS/KERNEL.S.DEF.txt
+++ b/SYS/KERNEL.S.DEF.txt
@@ -179,8 +179,8 @@ S.DCB.TTY.bG1ALT	.EQ 15
 S.DCB.TTY.OUTTAIL	.EQ 16
 S.DCB.TTY.OUTHEAD	.EQ 17
 S.DCB.TTY.INBUFFER	.EQ 18
-S.DCB.TTY.INBUFFER.MAX	.EQ 39
-S.DCB.TTY.OUTBUFFER	.EQ 40
+S.DCB.TTY.INBUFFER.MAX	.EQ 31
+S.DCB.TTY.OUTBUFFER	.EQ 32
 S.DCB.TTY.OUTBUFFER.MAX	.EQ 64
 *
 S.DCB.TTY			.EQ 64
diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt
index 6ff9c7cf..bdbd87d8 100644
--- a/SYS/KERNEL.S.IO.txt
+++ b/SYS/KERNEL.S.IO.txt
@@ -268,10 +268,7 @@ IO.CLOSE.SSOCK
 				
 				lda	IO.hFD				
 
-.1				jsr $FFFF				SELF MODIFIED
-				
-				lda IO.hFD
-				jmp K.FreeMem				
+.1				jmp $FFFF				SELF MODIFIED
 *--------------------------------------
 IO.CLOSE.PIPE	ldy #S.FD.PIPE.S
 
diff --git a/SYS/KERNEL.S.PWDX.txt b/SYS/KERNEL.S.PWDX.txt
index c0f0f5f9..a8fb1553 100644
--- a/SYS/KERNEL.S.PWDX.txt
+++ b/SYS/KERNEL.S.PWDX.txt
@@ -90,7 +90,6 @@ PWD.GetPWName	lda PWD.hDB
 				
 .8				iny
 				jsr PWD.NextString		skip PASSWORD
-				iny
 				jmp PWD.GetByte			get UID
 *--------------------------------------
 * ZPPtr2 : pPW (Input)
@@ -430,7 +429,7 @@ PWD.GetByte		stz ZPPtr4
 				bra .1
 				
 .8				lda ZPPtr4
-*				clc
+				clc
 				rts
 *--------------------------------------
 PWD.StoreRecord	sec