diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index d5fffda6..6de42926 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/DRV/DHGR.DRV.S.OSD.txt b/DRV/DHGR.DRV.S.OSD.txt
index 74e3a6ee..030a1b28 100644
--- a/DRV/DHGR.DRV.S.OSD.txt
+++ b/DRV/DHGR.DRV.S.OSD.txt
@@ -208,12 +208,15 @@ OSD.GETTEXTSIZE	clc
 				bcc .3
 				inc CBX.Cache+S.CB.SrcW+1
 				bra .3
-.4				plp
 
-				lda CBX.Cache+S.CB.SrcW
+.4				plp
+				bcs .5
+				
+				jmp CB.Update
+
+.5				lda CBX.Cache+S.CB.SrcW
 				ldx CBX.Cache+S.CB.SrcW+1
 				ldy CBX.Cache+S.CB.SrcH
-				bcc OSD.GETRECTBUFSIZE.RTS
 
 				sta DstBM.Cache+S.BM.W
 				stx DstBM.Cache+S.BM.W+1
diff --git a/LIB/LIBGUI.S.DRAW.txt b/LIB/LIBGUI.S.DRAW.txt
index 5c648e0f..13b64ebd 100644
--- a/LIB/LIBGUI.S.DRAW.txt
+++ b/LIB/LIBGUI.S.DRAW.txt
@@ -12,6 +12,10 @@ DrawToYA		jsr OBJ.Get
 				>LDYA ZPCBPtr
 				jsr	CB.Get
 
+			cmp #S.CB.CMD.DRAWTEXT2
+			bne .77
+			>DEBUG
+.77
 				jsr CLIP.CB.Cache
 				bcs .7
 
@@ -133,6 +137,7 @@ DrawLine.IncXY	lda DX					DX=DY
 				jsr GFXWrite.CB
 				bra .1
 .8				rts
+
 DrawLine.IncY	lda DY
 				eor #$ff
 				sta Counter
diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt
index b7187653..d8c7ae8f 100644
--- a/LIB/LIBGUI.S.MENU.txt
+++ b/LIB/LIBGUI.S.MENU.txt
@@ -25,7 +25,7 @@ MENU.MBarInit	>STYA ZPMENUPtr
 				
 				stz	DX
 				stz DX+1
-				
+	
 .1				lda (ZPPtr1)
 				beq .8
 				
@@ -49,16 +49,16 @@ MENU.MBarInit	>STYA ZPMENUPtr
 				lda DX+1
 				sta (ZPPtr1),y
 				
-				iny					#S.MBAR.XT
+				iny						#S.MBAR.XT
 				
 				lda DX
 				clc
-				adc #PREFS.MBARXMARGIN
+				adc PREFS.MBARXMARGIN
 				sta DX
-
 				sta (ZPPtr1),y
 
 				iny
+
 				lda DX+1
 				adc #0
 				sta DX+1
@@ -66,20 +66,19 @@ MENU.MBarInit	>STYA ZPMENUPtr
 				
 				lda DX
 				clc
-				adc CB.CACHE+S.CB.SrcX
+				adc CB.CACHE+S.CB.SrcW
 				sta DX
 
 				lda DX+1
-				adc CB.CACHE+S.CB.SrcX+1
+				adc CB.CACHE+S.CB.SrcW+1
 				sta DX+1
 
 				iny						#S.MBAR.X2
 
 				lda DX
 				clc
-				adc #PREFS.MBARXMARGIN
+				adc PREFS.MBARXMARGIN
 				sta DX
-
 				sta (ZPPtr1),y
 
 				iny
diff --git a/LIB/LIBGUI.S.WND.txt b/LIB/LIBGUI.S.WND.txt
index e145b410..0027f6b8 100644
--- a/LIB/LIBGUI.S.WND.txt
+++ b/LIB/LIBGUI.S.WND.txt
@@ -787,9 +787,12 @@ WND.PaintMBar	jsr CB.Clear
 
 				ldy #S.WND.MBAR.Y1
 				lda (ZPWNDPtr),y
+				clc
+				adc #1
 				sta CB.CACHE+S.CB.Y1
 				iny
 				lda (ZPWNDPtr),y
+				adc #0
 				sta CB.CACHE+S.CB.Y1+1
 
 				lda #S.MBAR.TEXT