diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index aa5d6520..9c5f2eaf 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 59a379f9..fa484369 100644
--- a/BIN/EDIT.S.BUF.txt
+++ b/BIN/EDIT.S.BUF.txt
@@ -518,6 +518,8 @@ BUF.BufPtrSetup	>STYA TmpLen
 				adc FileLen
 				sta FileLen
 				
+				tay
+				
 				lda TmpLen+1
 				adc FileLen+1
 				
@@ -528,8 +530,11 @@ BUF.BufPtrSetup	>STYA TmpLen
 				
 				bcc .8
 
-				>LDYA BufLen
+				ldy #0
+				lda FileLen+1
 				inc
+				inc
+				
 				>SYSCALL getmem
 				bcs .9
 
@@ -539,7 +544,11 @@ BUF.BufPtrSetup	>STYA TmpLen
 				>LDYA.G BufBase
 				>STYA BufPtr
 				
-				ldx BufLen+1
+				lda BufLen+1
+				tax
+				inc
+				inc
+				sta BufLen+1
 				
 				ldy #0
 				
@@ -547,14 +556,13 @@ BUF.BufPtrSetup	>STYA TmpLen
 				sta (BufPtrDst),y
 				iny
 				bne .1
+
 				inc BufPtr
 				inc BufPtrDst
 
 				dex
 				bne .1
 				
-				inc BufLen+1
-				
 				>LDA.G hBuf
 				>SYSCALL freemem
 				
diff --git a/BIN/EDIT.S.FILE.txt b/BIN/EDIT.S.FILE.txt
index fc3de85b..3e0417f6 100644
--- a/BIN/EDIT.S.FILE.txt
+++ b/BIN/EDIT.S.FILE.txt
@@ -70,9 +70,6 @@ FILE.Load.TXT	stz FileLen
 
 				>STZ.G FileType
 
-				jsr FILE.GetBuffer
-				bcs .99
-				
 				>LDYAI 256
 				>SYSCALL GetMem
 				bcs .99
@@ -86,10 +83,17 @@ FILE.Load.TXT	stz FileLen
 				>LDA.G hFileName
 				>SYSCALL GetMemPtr
 				>SYSCALL fopen
-.99				bcs .9
+				bcs .99
 				
 				sta TmpIndex
+				>PUSHEA.G STATBUF
+				lda TmpIndex
+				>SYSCALL fstat
+				bcs .99
 				
+				jsr FILE.GetBuffer
+.99				bcs .9
+
 .1				>PUSHWI 254
 				>PUSHW ZPPTR1
 				lda TmpIndex
@@ -98,9 +102,10 @@ FILE.Load.TXT	stz FileLen
 
 				lda #0
 				sta (ZPPTR1),y			Y = line len
-				
+
 				ldx #0
 				ldy #0
+
 				lda (ZPPTR1)
 				beq .8
 				
@@ -255,13 +260,9 @@ FILE.GetBuffer	>LDA.G STATBUF+S.STAT.SIZE+3
 				
 				dey
 				lda (pData),y			Size HI
-				cmp #16
-				bcs .1
-				
-				lda #13					Min = 3k
-				
-.1				adc #3					1K more		
-				
+				inc
+				inc
+
 				ldy #0					Size LO
 				>STYA BufLen
 				>SYSCALL GetMem