diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index fe72286b..7a52fd74 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.BUF.txt b/BIN/EDIT.S.BUF.txt
index 732c2c96..24e8fdbe 100644
--- a/BIN/EDIT.S.BUF.txt
+++ b/BIN/EDIT.S.BUF.txt
@@ -335,16 +335,21 @@ BUF.CopyTail	ldy #0
 BUF.ComputeCOffset
 				jsr BUF.GetLine
 				bcs .9
+
 				phy						save line length
+
 				ldy #FileX
 				lda (pData),y
 				clc
 				adc BUF.LOffset
 				sta BUF.COffset
+
 				lda #0
 				adc BUF.LOffset+1
 				sta BUF.COffset+1
+
 				ply
+
 				clc
 .9				rts
 *--------------------------------------
diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index 44d48926..942d5fc6 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -57,7 +57,7 @@ Ctrl.DEL		jsr BUF.ComputeCOffset
 				jsr Ctrl.BS
 				bcs .9
 				
-				jmp Ctrl.Z.1
+				jmp Ctrl.Z
 
 .8				clc
 .9				rts
@@ -460,21 +460,20 @@ Ctrl.W			jsr BUF.ComputeCOffset	Y=line len
 				sta (pData),y
 				bra Ctrl.D
 				
-.8				rts		
+.8
+Ctrl.W.RTS		rts
 *--------------------------------------
 Ctrl.X			jsr BUF.SelToClipboard
-				bcs Ctrl.X.RTS
+				bcs Ctrl.W.RTS
 
 Ctrl.D			jsr BUF.DelSel
-				bcs Ctrl.X.RTS
+				bcs Ctrl.W.RTS
 				
 				jsr SCRN.CursorAdjust
 				jsr SCRN.UpdateMain
-				bcs Ctrl.X.RTS
+				bcs Ctrl.W.RTS
 
 				jmp SCRN.UpdateStatusBar
-
-Ctrl.X.RTS		rts
 *--------------------------------------
 Ctrl.Y			ldy #FileY+1
 				lda (pData),y
@@ -502,7 +501,7 @@ Ctrl.Y			ldy #FileY+1
 				
 				bra Ctrl.Y
 				
-.2				jsr BUF.GetLine			Y=linelen
+.2				jsr BUF.GetLine
 
 				tya						Y = line length
 				>STA.G FileX
@@ -512,35 +511,34 @@ Ctrl.Y			ldy #FileY+1
 Ctrl.Z			jsr BUF.ComputeCOffset
 
 				lda BUF.COffset
-				cmp BufLen
+				eor BufLen
+				bne .1
+				
 				lda BUF.COffset+1
-				sbc BufLen+1
-				bcc Ctrl.Z.1
+				eor BufLen+1
+				bne .1
 				
 				clc
-Ctrl.Z.RTS		rts
+				rts
 
-Ctrl.Z.1		jsr BUF.DelCharAtCursor
-				bcs Ctrl.Z.RTS
+.1				jsr BUF.DelCharAtCursor
+				bcs Ctrl.W.RTS
 
 				cmp #C.CR				did we DEL a CR ?
-				bne .1
+				beq Prompt.Help.Upd		yes repaint whole screen
 
-				jsr SCRN.UpdateMain
-				bcs Ctrl.Z.RTS
-				jmp SCRN.UpdateStatusBar
-				
-.1				jsr SCRN.UpdateCurrentLine
-				bcs Ctrl.Z.RTS
+				jsr SCRN.UpdateCurrentLine
+				bcs Ctrl.W.RTS
 				jmp SCRN.UpdateStatusBar
 *--------------------------------------
 Prompt.Help		>STZ.G PromptMode
 
-				jsr SCRN.UpdateMain
+Prompt.Help.Upd	jsr SCRN.UpdateMain
 				bcs .9
 				jmp SCRN.UpdateStatusBar
 
-.9				rts
+.9				
+Prompt.Help.RTS	rts
 *--------------------------------------
 Prompt.Find		cmp #3
 				bne .1
@@ -549,7 +547,7 @@ Prompt.Find		cmp #3
 				
 				jmp SCRN.UpdateStatusBar
 				
-.1				cmp #13
+.1				cmp #C.CR
 				bne .2
 				
 .2				
@@ -566,7 +564,7 @@ Prompt.Replace	cmp #3
 				bcs .9
 				rts
 				
-.1				cmp #13
+.1				cmp #C.CR
 				bne .2
 				
 .2				
@@ -609,7 +607,7 @@ Prompt.Save		cmp #3					Ctrl-C
 				bcs .9
 				rts
 				
-.2				cmp #127
+.2				cmp #C.DEL
 				bne .3
 				
 				>LDA.G PromptBufPtr
diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt
index 610c2905..cb63253d 100644
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@@ -487,6 +487,7 @@ MSG.HELP		>PSTR "All commands: (* = Not yet implemented)"
 				>PSTR "  Ctrl-W : Erase current line"
 				>PSTR "  Ctrl-X : Cut block to clipboard"
 				>PSTR "  Ctrl-Y : Go to end of file"
+				>PSTR "  Ctrl-Z : Erase char under cursor"
 				.HS 00
 *--------------------------------------
 MSG.NEWFILE		.AZ "(new file)"