diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index ba7d1434..baa09d6e 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 786c7aef..dea480ba 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -110,10 +110,11 @@ CMD.CD.YA		>SYSCALL realpath
 				bne .14
 
 				lda ZPTmpW
-				jmp CMD.SetCWDA			already ends with a /
+				bra CMD.SetCWDA			already ends with a /
 
-.14				iny
-				iny
+.14				iny						back to /
+				iny						at \0
+				iny						add+1 for adding \0 after adding '/'
 				lda #0
 				>SYSCALL getmem
 				bcs .19
diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt
index 3209c243..e3c4fe57 100644
--- a/BIN/SH.S.txt
+++ b/BIN/SH.S.txt
@@ -500,8 +500,8 @@ ToUpperCase		cmp #'a'
 CS.END
 *--------------------------------------
 MSG.GREETINGS	.AZ "\r\nA2osX-SH %d.%d\r\n\r\n"
-MSG.PROMPT		.AZ "\e[7h$ "			Enable Line Wrap
-MSG.PROMPTCRLF	.AZ "\e[7l\r\n"		Disable Line Wrap
+MSG.PROMPT		.AZ "\e[?7h$ "			Enable Line Wrap
+MSG.PROMPTCRLF	.AZ "\e[?7l\r\n"		Disable Line Wrap
 MSG.TRACE		.AS ">"
 MSG.BATCHLINE	.AZ "%s\r\n"
 MSG.BATCHERR	.AZ "%s^\r\nLine #%D:"
diff --git a/SYS/KERNEL.S.TERM.txt b/SYS/KERNEL.S.TERM.txt
index a2310a62..948c396d 100644
--- a/SYS/KERNEL.S.TERM.txt
+++ b/SYS/KERNEL.S.TERM.txt
@@ -209,7 +209,8 @@ DRV.TERM.READ	jsr DRV.TERM.GetIOCTLBufCntDCB
 	
 .6				ldy #S.DCB.TTY.OUTTAIL
 				lda (ZPDCBPtr),y
-				iny						cmp (ZPDCBPtr),y		OUTHEAD
+				iny
+				cmp (ZPDCBPtr),y		OUTHEAD
 				beq .9					no char in output buffer...
 .7				stz .8+1
 .70				inc ZPCount
@@ -444,18 +445,22 @@ DRV.TERM.CSI	ldy #S.DCB.TTY.INBUFFER
 DRV.TERM.CSI.Exec
 				stz CsiHeader
 				stz CsiParamCnt
+
 				lda #S.DCB.TTY.INBUFFER+1		EscSeq Ptr
 				clc
 				adc ZPDCBPtr
 				sta ZPPtr2
+
 				lda /S.DCB.TTY.INBUFFER+1
 				adc ZPDCBPtr+1
 				sta ZPPtr2+1
+
 				lda (ZPPtr2)
 				cmp #'?'
 				bne .2
 
 				sta CsiHeader
+
 .1				jsr SHARED.NextCharPtr2
 
 .2				jsr MATH.Dec2ACC32
@@ -477,6 +482,7 @@ DRV.TERM.CSI.Exec
 				beq .1
 
 .5				jsr RESET.MODE
+
 				lda (ZPPtr2)
 				ldx #CsiCodes.Cnt-1
 
@@ -508,26 +514,32 @@ Csi.ResetMode	clc
 
 				ldx CsiParamCnt
 				beq .99
+				
 				dex
 				bne .99
-
+				
 				ldx CsiHeader
+
 				lda CsiParams
 				php
 
 				cmp #20					bCRLF
 				bne .1
+
 				txa
 				bne .98
 
 				ldy #S.DCB.TTY.bCRLF
 				bra .8
+				
 .1				cmp #7
 				bne .98
 
 				cpx #'?'
 				bne .98
+
 				ldy #S.DCB.TTY.bLINEWRAP
+
 .8				plp
 				ror
 				sta (ZPDCBPtr),y