diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 5ab81dfe..25902993 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 c97382b4..45b954f4 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt
index ed7e8c3b..cb8f89a8 100644
--- a/DRV/CONSOLE.DRV.S.txt
+++ b/DRV/CONSOLE.DRV.S.txt
@@ -162,9 +162,9 @@ OPEN			sta A2osX.SCRNDEVS		DEV.ID in A
 				ldy #0
 				
 .1				lda TelnetOpt,y
-				beq CONTROL
 				jsr Char.Out.Put
 				iny
+				cpy #TelnetOpt.LEN
 				bne .1
 *--------------------------------------
 CONTROL			sta SETTEXT
@@ -1058,15 +1058,16 @@ GetPtrsAndCnt	ldy #S.IOCTL.BUFPTR
 				rts
 *--------------------------------------
 DRV.CS.END
+*--------------------------------------
+BASEL			.HS	00.80.00.80.00.80.00.80.28.A8.28.A8.28.A8.28.A8.50.D0.50.D0.50.D0.50.D0
+BASEH			.HS	04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07
+*--------------------------------------
+CtrlChars		.HS 05080A0C0D151B
+CtrlChars.Cnt	.EQ *-CtrlChars
+*--------------------------------------
 EscCodes		>PSTR "MDc" 
 EscSeqCmds		>PSTR "mnrKH"
 ENQ.String		.AZ "XTERM"
-SB.IS.TTYPE		.DA #IAC,#SB,#TELOPT.TTYPE,#SB.IS
-				.AS 'XTERM'
-				.DA #IAC,#SE
-SB.IS.TTYPE.LEN	.EQ *-SB.IS.TTYPE
-BASEL			.HS	00.80.00.80.00.80.00.80.28.A8.28.A8.28.A8.28.A8.50.D0.50.D0.50.D0.50.D0
-BASEH			.HS	04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07
 *--------------------------------------
 KeyRemapped		.HS 05080A0B0D15		L,D,U,CR,R
 KeyRemappedIdx	.HS 050004080C0F
@@ -1076,20 +1077,22 @@ KeyRemappedDOWN	.HS 1B5B4200			esc[B
 KeyRemappedUP	.HS 1B5B4100			esc[A
 KeyRemappedCR	.HS 0D0A00				crlf
 KeyRemappedRGHT	.HS 1B5B4300			esc[C
+*--------------------------------------
 TelnetOpt		.DA #IAC,#DO,#TELOPT.ECHO
-				.DA #0
+TelnetOpt.LEN	.EQ *-TelnetOpt
 *--------------------------------------
 WILLDO			.DA #TELOPT.BINARY,#TELOPT.SGA,#TELOPT.NAWS
 WILLDO.CNT		.EQ *-WILLDO
 WILLDONT		.DA #TELOPT.TSPEED,#TELOPT.LINEMODE
 WILLDONT.CNT	.EQ *-WILLDONT
-DOWILL			.DA #TELOPT.BINARY,#TELOPT.SGA,#TELOPT.NAWS
+DOWILL			.DA #TELOPT.BINARY,#TELOPT.SGA,#TELOPT.NAWS,#TELOPT.TTYPE
 DOWILL.CNT		.EQ *-DOWILL
 DOWONT			.DA #TELOPT.NEWENVIRON
 DOWONT.CNT		.EQ *-DOWONT
-*--------------------------------------
-CtrlChars		.HS 05080A0C0D151B
-CtrlChars.Cnt	.EQ *-CtrlChars
+SB.IS.TTYPE		.DA #IAC,#SB,#TELOPT.TTYPE,#SB.IS
+				.AS 'XTERM'
+				.DA #IAC,#SE
+SB.IS.TTYPE.LEN	.EQ *-SB.IS.TTYPE
 *--------------------------------------
 CH				.BS 1
 CV				.BS 1