diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 0808936f..ba7d13d9 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index 109fd34e..6ee33b95 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -248,10 +248,7 @@ Ctrl.CR			lda #C.CR
 				jsr BUF.InsertA
 				bcs .9
 
-				>PUSHW L.SEQ.CEOL
-				>PUSHBI 0
-				>SYSCALL printf2
-				bcs .9
+				jsr SCRN.LineBufInitEdit	EOL
 
 				>STZ.G FileX
 				>LDA.G CurY
@@ -261,7 +258,7 @@ Ctrl.CR			lda #C.CR
 				
 				dec
 				>CMP.G ViewPortHm1
-				beq .1					No scoll needed
+				bne .6					No scroll needed
 				
 				>PUSHW L.SEQ.SCROLLCURDN
 				>LDA.G CurY
@@ -272,16 +269,25 @@ Ctrl.CR			lda #C.CR
 				dec
 				>PUSHA
 				>PUSHBI 2
-				>SYSCALL printf2
+				jsr SCRN.LineBufSprintf
 				bcs .9
 
-				jsr SCRN.ResetScrollRgn
+				>PUSHW L.SEQ.SCROLLRGN
+				>LDA.G ScreenH
+				dec
+				>PUSHA
+				>PUSHBI 1
+				jsr SCRN.LineBufSprintf
 				bcs .9
 
-.1				>INC.G CurY
-				jsr SCRN.UpdateCurrentLine
+.6				jsr SCRN.LineBufOut
+				bcs .9
+
+.7				>INC.G CurY
+				jmp SCRN.UpdateCurrentLine
+
+.8				jmp SCRN.LineBufOut
 
-.8				clc
 .9				rts
 *--------------------------------------
 Ctrl.O			ldy #FileY+1
@@ -597,7 +603,7 @@ Ctrl.Z			jsr BUF.ComputeCOffset
 				
 				dec
 				>CMP.G ViewPortHm1
-				beq .8					No scoll needed
+				beq .8					No scroll needed
 				
 				>PUSHW L.SEQ.SCROLLCURUP
 				>LDA.G CurY
diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt
index ce571397..2a65a4b4 100644
--- a/BIN/EDIT.S.SCRN.txt
+++ b/BIN/EDIT.S.SCRN.txt
@@ -101,6 +101,7 @@ SCRN.UpdateTopBarAsync
 				jsr SCRN.SEQS.ToLineBuf
 				
 				jmp SCRN.LineBufOut
+				
 .8				clc				
 .9				rts
 *--------------------------------------
@@ -246,14 +247,11 @@ SCRN.UpdateMain.1
 
 				bra .8
 
-.5				ldx #0
-				ldy TmpByte
-				jsr SCRN.GotoXY
-				bcs SCRN.UpdateMain.9
+.5				jsr SCRN.LineBufInitEdit
 
-				>PUSHW L.SEQ.CEOL
-				>PUSHBI 0
-				>SYSCALL printf2
+				ldy TmpByte
+				jsr SCRN.LineBufGotoLineY
+				jsr SCRN.UpdateLineAtBufPtr.EOL
 				bcs SCRN.UpdateMain.9
 
 				inc TmpByte
@@ -303,7 +301,7 @@ SCRN.UpdateLineAtALenY
 
 				>LDA.G ScreenX
 				cmp TmpLen
-				bcs SCRN.UpdateLineAtBufPtr.END
+				bcs SCRN.UpdateLineAtBufPtr.EOL
 				
 				tay
 				clc
@@ -363,13 +361,12 @@ SCRN.UpdateLineAtBufPtr
 				bne .2
 
 .8				bit bSelected
-				bpl SCRN.UpdateLineAtBufPtr.END
+				bpl SCRN.UpdateLineAtBufPtr.EOL
 				jsr SCRN.ToggleSel
 
-SCRN.UpdateLineAtBufPtr.END
+SCRN.UpdateLineAtBufPtr.EOL
 				ldx #SEQ.CEOL-SEQS
 				jsr SCRN.SEQS.ToLineBuf
-				
 				jmp SCRN.LineBufOut
 *--------------------------------------
 SCRN.ToggleSel	ldy #SEQ.NORM-SEQS
@@ -488,8 +485,15 @@ SCRN.GotoXY		>PUSHW L.MSG.GOTOXY
 				inc
 				>PUSHA
 				>PUSHBI 2
+				
+				lda #$ff
+				>STA.G bUpdateScreen
+				
 				>SYSCALL printf2
-				rts
+				bcs .9
+				
+				>STZ.G bUpdateScreen
+.9				rts
 *--------------------------------------
 SCRN.scrollUp	>PUSHW L.SEQ.SCROLLUP
 				>PUSHBI 0
@@ -613,7 +617,6 @@ SCRN.LineBufOut	lda #0
 				>PUSHW.G LineBufBase
 				>PUSHBI 0
 				>SYSCALL printf2
-				
 				>STZ.G bUpdateScreen
 				rts
 *--------------------------------------