diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index eb4e6ad1..8b043f82 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 6f97c88b..38943958 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -437,6 +437,8 @@ Ctrl.Q			lda #$FF
 *--------------------------------------
 Ctrl.S			>LDYA L.DLG.SAVE
 				jsr DLG.Open
+				jsr DLG.Run
+				jsr DLG.Close
 				clc
 				rts
 
diff --git a/BIN/EDIT.S.DLG.txt b/BIN/EDIT.S.DLG.txt
index 4b59e928..37885cd4 100644
--- a/BIN/EDIT.S.DLG.txt
+++ b/BIN/EDIT.S.DLG.txt
@@ -110,6 +110,43 @@ DLG.Open		>STYA ZPPTR2
 				>STYA LineBufPtr
 				jmp (J.DLG.DrawCtrls,x)		
 *--------------------------------------
+DLG.Run			>SYSCALL getchar
+				bcs .9
+				
+				cmp #3
+				beq .8
+				
+				cmp #C.CR
+				beq .8
+				
+				cmp #C.TAB
+				beq DLG.NextFocus
+				
+				bra DLG.Run
+				
+.8				clc
+.9				rts
+*--------------------------------------
+DLG.NextFocus
+*--------------------------------------
+DLG.SetFocus
+
+				clc
+				rts
+*--------------------------------------
+DLG.Close		ldy #S.DLG.H
+				lda (ZPPTR1),y
+				
+				tax
+				
+				ldy #S.DLG.Y
+				lda (ZPPTR1),y
+				
+				
+				
+				clc
+				rts
+*--------------------------------------
 DLG.DrawCtrls.L	jsr DLG.DrawCtrls.GotoXY
 				bcs .9
 				
@@ -142,7 +179,9 @@ DLG.DrawCtrls.TB
 				iny
 				iny
 				iny
+				
 				iny
+				
 				iny
 
 				lda (ZPPTR1),y
@@ -152,21 +191,96 @@ DLG.DrawCtrls.TB
 				>SYSCALL getmemptr
 				>STYA ZPPTR2
 	
+				lda #"["
+				jsr SCRN.ToLineBuf
+
 				ldy #0
 				
 .1				lda (ZPPTR2),y
-				beq .8
+				beq .2
 
 				jsr SCRN.ToLineBuf
 				iny
 				bra .1
 				
-.8				jmp SCRN.LineBufOut
+.2				tya
+				tax
+				
+				ldy TmpByte
+				lda (ZPPTR1),y
+				tay
+				
+				iny
+				iny
+				iny
+				
+				iny
+				
+.3				txa	
+				cmp (ZPPTR1),y			MAXCHAR
+				beq .8
+				
+				lda #C.SPACE
+				jsr SCRN.ToLineBuf
+				inx
+				bra .3
+
+.8				lda #"]"
+				jsr SCRN.ToLineBuf
+				
+				jmp SCRN.LineBufOut
 .9				rts
 *--------------------------------------
 DLG.DrawCtrls.OL
-				clc
-				rts
+				jsr DLG.DrawCtrls.GotoXY
+				bcs .9
+				
+				ldy TmpByte
+				lda (ZPPTR1),y
+				tay
+				
+				iny
+				iny
+				iny
+				
+				iny
+				
+				lda (ZPPTR1),y			value
+				sta TmpCount
+				
+				iny
+				
+				ldx #0
+				
+.1				lda #"("
+				jsr SCRN.ToLineBuf
+				lda #"o"
+				cpx TmpCount
+				beq .2
+				lda #C.SPACE
+				
+.2				jsr SCRN.ToLineBuf
+				lda #")"
+				jsr SCRN.ToLineBuf
+				lda #C.SPACE
+				jsr SCRN.ToLineBuf
+				
+.3				lda (ZPPTR1),y
+				beq .4
+				jsr SCRN.ToLineBuf
+				iny
+				bra .3
+				
+.4				lda #C.SPACE
+				jsr SCRN.ToLineBuf
+				
+				inx
+				iny
+				lda (ZPPTR1),y
+				bne .1
+				
+.8				jmp SCRN.LineBufOut
+.9				rts
 *--------------------------------------
 DLG.DrawCtrls.GotoXY
 				ldy TmpByte				CtrlID
diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt
index eaf153e6..c1ccd658 100644
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@@ -450,28 +450,25 @@ DLG.SAVE		.DA #DLG.SAVE.LEN		Size
 				.DA #DLG.SAVE.4-DLG.SAVE
 				.DA #0
 
-DLG.SAVE.1		.DA #S.DLG.Ctrl.LBL,#3,#2
+DLG.SAVE.1		.DA #S.DLG.Ctrl.LBL,#2,#2
 				.AZ "Filename :"
 
-DLG.SAVE.2		.DA #S.DLG.Ctrl.TB,#4,#3
+DLG.SAVE.2		.DA #S.DLG.Ctrl.TB,#2,#3
 				.DA #0,#64,#hFileName	CURPOS,MAXCHAR,hMem
 				
-DLG.SAVE.3		.DA #S.DLG.Ctrl.LBL,#3,#4
+DLG.SAVE.3		.DA #S.DLG.Ctrl.LBL,#2,#4
 				.AZ "Filetype :"
 				
-DLG.SAVE.4		.DA #S.DLG.Ctrl.OL,#3,#5
+DLG.SAVE.4		.DA #S.DLG.Ctrl.OL,#2,#5
 				.DA #20					Ctrl-T
 				.DA #0					Value
-				.DA #3					Count
-				.DA #DLG.SAVE.OL.CR
-				.DA #DLG.SAVE.OL.LF
-				.DA #DLG.SAVE.OL.ASM
+				.AZ "TXT/CR"
+				.AZ "TXT/CRLF"
+				.AZ "S-C/ASM"
+				.DA #0
 				
 DLG.SAVE.T		.AZ "Save As..."		Title
 DLG.SAVE.S		.AZ "CR:Save, Ctrl-T:Change Type, Ctrl-C:Cancel"
-DLG.SAVE.OL.CR	.AZ "TXT/CR"
-DLG.SAVE.OL.LF	.AZ "TXT/CRLF"
-DLG.SAVE.OL.ASM	.AZ "S-C/ASM"
 DLG.SAVE.LEN	.EQ *-DLG.SAVE
 *--------------------------------------
 				.DUMMY