diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index ef9feeaf..02eb86a9 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 f11e6dd1..2fc7e01d 100644
--- a/BIN/EDIT.S.BUF.txt
+++ b/BIN/EDIT.S.BUF.txt
@@ -8,7 +8,9 @@ BUF.InsertA		sta TmpByte
 				cpy #255
 				beq .8
 
+				>LDYAI 1
 				jsr BUF.BufPtrSetup
+				bcs .9
 				
 				lda BufPtr
 				clc
@@ -46,7 +48,10 @@ BUF.InsertTAB	>LDA.G FileX
 				adc TmpByte
 				bcs .8
 				
+				ldy TmpByte
+				lda #0
 				jsr BUF.BufPtrSetup
+				bcs .9
 				
 				lda BufPtr
 				clc
@@ -125,21 +130,10 @@ BUF.InsertClipboard
 
 				jsr BUF.ComputeCOffset
 
-				lda FileLen
-				clc
-				>ADC.G ClipboardLen
-				pha
-				lda FileLen+1
-				iny
-				adc (pData),y
-				ply
-
-				cpy BufLen
-				sbc BufLen+1
-				bcs .8
-
+				>LDYA.G ClipboardLen 
 				jsr BUF.BufPtrSetup
-				
+				bcs .9
+
 				lda BufPtr
 				clc
 				>ADC.G ClipboardLen
@@ -188,8 +182,8 @@ BUF.InsertClipboard
 				adc FileLen+1
 				sta FileLen+1
 		
+				jsr BUF.ResetSel
 				jsr SCRN.UpdateStatusBar
-				
 				jmp SCRN.Unsaved
 				
 .8				clc	
@@ -563,7 +557,23 @@ BUF.GetSelLen	ldy #SelEnd
 *--------------------------------------
 * in : Y,A = cnt to insert at COffset 
 *--------------------------------------
-BUF.BufPtrSetup	lda BUF.COffset
+BUF.BufPtrSetup	pha
+				tya
+				clc
+				
+				adc FileLen
+				tay
+				
+				pla
+				adc FileLen+1
+
+				cpy BufLen
+				sbc BufLen+1
+				bcs .9
+
+
+
+				lda BUF.COffset
 				clc
 				>ADC.G BufBase
 				sta BufPtr
@@ -572,6 +582,12 @@ BUF.BufPtrSetup	lda BUF.COffset
 				>ADC.G BufBase+1
 				sta BufPtr+1
 
+				
+				clc
+				rts
+				
+.9				lda #E.BUF
+				sec
 				rts
 *--------------------------------------
 MAN
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index 36c5f04e..1d505f7b 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -9,7 +9,6 @@ NEW
 				.INB INC/A2OSX.I
 				.INB INC/KERNEL.I
 				.INB INC/MLI.I
-				.INB INC/LIBCRYPT.I
 *--------------------------------------
 				.DUMMY
 				.OR ZPBIN
@@ -61,7 +60,6 @@ CS.START		cld
 				.DA CS.DOEVENT
 				.DA	CS.QUIT
 L.MSG.NOAUTH	.DA MSG.NOAUTH
-L.LIBCRYPT		.DA LIBCRYPT
 L.MSG.LOGIN		.DA MSG.LOGIN
 L.MSG.PASSWORD	.DA MSG.PASSWORD
 L.MSG.BAD		.DA MSG.BAD
@@ -101,12 +99,7 @@ CS.RUN.NOAUTH	>LDYA L.MSG.NOAUTH
 				jmp CS.RUN.EXEC
 .9				rts
 *--------------------------------------
-CS.RUN.AUTH		>LDYA L.LIBCRYPT
-				>SYSCALL LoadLib
-				bcs CS.INIT.RTS
-				sta hLIBCRYPT
-
-				lda #3
+CS.RUN.AUTH		lda #3
 				sta ZPRetryCnt
 
 .1				>LDYA L.MSG.LOGIN
@@ -247,7 +240,7 @@ CS.RUN.CHECKPWD	rol ZPbValidUser
 
 				>PUSHW ZPGetlinePtr
 				>PUSHW ZPGetlinePtr
-				>LIBCALL hLIBCRYPT,LIBCRYPT.MD5
+				>SYSCALL MD5
 				
 				lda ZPPWPtr
 				clc
@@ -452,10 +445,7 @@ CS.DOEVENT
 				sec
 				rts		
 *--------------------------------------
-CS.QUIT			lda hLIBCRYPT
-				beq CS.CLEANUP
-				>SYSCALL UnloadLib
-
+CS.QUIT			
 CS.CLEANUP		lda ZPhGetLine
 				beq CS.CLEANUP.hPW
 
@@ -473,8 +463,6 @@ CS.CLEANUP.hPW	lda ZPhPW
 *--------------------------------------
 CS.END
 *--------------------------------------
-LIBCRYPT		.AZ "libcrypt"
-hLIBCRYPT		.BS 1
 MSG.NOAUTH		.AS "\r\n\r\nA2osX-Login:No ETC/PASSWD file present, Logged as ROOT.\r\n"
 				.AS "Consider adding ROOT password with USERADD command.\r\n"
 MSG.CRLF		.AZ "\r\n"