diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp
index f90b3d25..1e22feb6 100644
--- a/TileEngine/Render Dirty.cpp	
+++ b/TileEngine/Render Dirty.cpp	
@@ -1009,6 +1009,12 @@ BOOLEAN UpdateVideoOverlay( VIDEO_OVERLAY_DESC *pTopmostDesc, UINT32 iBlitterInd
 				}
 			}
 
+			if ( uiFlags & VOVERLAY_DESC_FONT )
+			{
+				gVideoOverlays[iBlitterIndex].uiFontID = pTopmostDesc->uiFontID;
+				gVideoOverlays[iBlitterIndex].ubFontBack = pTopmostDesc->ubFontBack;
+				gVideoOverlays[iBlitterIndex].ubFontFore = pTopmostDesc->ubFontFore;
+			}
 
 			if ( uiFlags & VOVERLAY_DESC_DISABLED )
 			{
diff --git a/TileEngine/Render Dirty.h b/TileEngine/Render Dirty.h
index e3171deb..113f0766 100644
--- a/TileEngine/Render Dirty.h	
+++ b/TileEngine/Render Dirty.h	
@@ -15,9 +15,10 @@
 #define	VOVERLAY_STARTDISABLED				0x00000002
 
 
-#define VOVERLAY_DESC_TEXT			0x00001000
+#define VOVERLAY_DESC_TEXT		0x00001000
 #define VOVERLAY_DESC_DISABLED	0x00002000
 #define VOVERLAY_DESC_POSITION	0x00004000
+#define VOVERLAY_DESC_FONT		0x00008000
 
 // STRUCTURES
 
diff --git a/gamescreen.cpp b/gamescreen.cpp
index 67e70d99..28fd812d 100644
--- a/gamescreen.cpp
+++ b/gamescreen.cpp
@@ -166,6 +166,7 @@ UINT32 MainGameScreenInit(void)
 	UnLockVideoSurface( FRAME_BUFFER);
 
 	InitializeBackgroundRects();
+	InitializeBaseDirtyRectQueue();
 
 	//EnvSetTimeInHours(ENV_TIME_12);
 
@@ -188,8 +189,8 @@ UINT32 MainGameScreenInit(void)
 	giFPSOverlay =	RegisterVideoOverlay( ( VOVERLAY_STARTDISABLED | VOVERLAY_DIRTYBYTEXT ), &VideoOverlayDesc );
 
 	// SECOND, PERIOD COUNTER
-	VideoOverlayDesc.sLeft			= 30;
-	VideoOverlayDesc.sTop				= 0;
+	VideoOverlayDesc.sLeft			= 0;
+	VideoOverlayDesc.sTop				= 12;
 	VideoOverlayDesc.sX					= VideoOverlayDesc.sLeft;
 	VideoOverlayDesc.sY					= VideoOverlayDesc.sTop;
 	swprintf( VideoOverlayDesc.pzText, L"Levelnodes: 100000" );
diff --git a/jascreens.cpp b/jascreens.cpp
index 80f5188a..f921cb0b 100644
--- a/jascreens.cpp
+++ b/jascreens.cpp
@@ -122,46 +122,33 @@ void DisplayFrameRate( )
 		uiFrameCount = 0;
 	}
 
-	// Create string
-	SetFont( SMALLFONT1 );
-
-	//DebugMsg(TOPIC_JA2, DBG_LEVEL_0, String( "FPS: %d ", __min( uiFPS, 1000 ) ) );
-
-	if ( uiFPS < 20 )
-	{
-		SetFontBackground( FONT_MCOLOR_BLACK );
-		SetFontForeground( FONT_MCOLOR_LTRED );
-	}
-	else
-	{
-		SetFontBackground( FONT_MCOLOR_BLACK );
-		SetFontForeground( FONT_MCOLOR_DKGRAY );
-	}
-
 	if ( gbFPSDisplay == SHOW_FULL_FPS )
 	{
+		memset(&VideoOverlayDesc, 0, sizeof(VideoOverlayDesc));
+
 		// FRAME RATE
-		memset( &VideoOverlayDesc, 0, sizeof( VideoOverlayDesc ) );
-		swprintf( VideoOverlayDesc.pzText, L"%ld", __min( uiFPS, 1000 ) );
-		VideoOverlayDesc.uiFlags	= VOVERLAY_DESC_TEXT;
+		VideoOverlayDesc.uiFontID = SMALLFONT1;
+		VideoOverlayDesc.ubFontBack = FONT_MCOLOR_BLACK;
+		VideoOverlayDesc.ubFontFore = uiFPS < 20 ? FONT_MCOLOR_LTRED : FONT_MCOLOR_DKGRAY;
+		swprintf( VideoOverlayDesc.pzText, L"FPS: %ld", __min( uiFPS, 1000 ) );
+		VideoOverlayDesc.uiFlags	= VOVERLAY_DESC_TEXT | VOVERLAY_DESC_FONT | VOVERLAY_DESC_DISABLED;
 		UpdateVideoOverlay( &VideoOverlayDesc, giFPSOverlay, FALSE );
 
 		// TIMER COUNTER
-		swprintf( VideoOverlayDesc.pzText, L"%ld", __min( giTimerDiag, 1000 ) );
-		VideoOverlayDesc.uiFlags	= VOVERLAY_DESC_TEXT;
+		swprintf( VideoOverlayDesc.pzText, L"Frame: %04ld ms", __min( giTimerDiag, 10000 ) );
+		VideoOverlayDesc.uiFlags	= VOVERLAY_DESC_TEXT | VOVERLAY_DESC_DISABLED;
 		UpdateVideoOverlay( &VideoOverlayDesc, giCounterPeriodOverlay, FALSE );
 
-
-		if( GetMouseMapPos( &usMapPos) )
-		{
+		//if( GetMouseMapPos( &usMapPos) )
+		//{
 			//gprintfdirty( 0, 315, L"(%d)",sMapPos);
 			//mprintf( 0,315,L"(%d)",sMapPos);
-		}
-		else
-		{
+		//}
+		//else
+		//{
 			//gprintfdirty( 0, 315, L"(%d %d)",gusMouseXPos, gusMouseYPos - INTERFACE_START_Y );
 			//mprintf( 0,315,L"(%d %d)",gusMouseXPos, gusMouseYPos - INTERFACE_START_Y );
-		}
+		//}
 	}
 
 	if ( ( gTacticalStatus.uiFlags & GODMODE ) )