diff --git a/source/console.c b/source/console.c
index 4645149..591ec7c 100644
--- a/source/console.c
+++ b/source/console.c
@@ -1200,14 +1200,14 @@ void Con_DrawConsole (int lines, qboolean drawinput)
 		return;
 
 	con_vislines = lines * vid.conheight / glheight;
-	GL_SetCanvas (CANVAS_CONSOLE);
+	//GL_SetCanvas (CANVAS_CONSOLE);
 
 // draw the background
+
+	Draw_ConsoleBackground ();
 	
 	if (!console_enabled && !developer.value)
 		return;
-	
-	Draw_ConsoleBackground ();
 
 // draw the buffer text
 	rows = (con_vislines +7)/8;
diff --git a/source/gl_draw.c b/source/gl_draw.c
index 5a7aedc..f782c62 100644
--- a/source/gl_draw.c
+++ b/source/gl_draw.c
@@ -863,9 +863,9 @@ Draw_ConsoleBackground -- johnfitz -- rewritten
 void Draw_ConsoleBackground (void)
 {
 
-	//GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
+	GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
 
-	Draw_FillByColor  (0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0);
+	Draw_FillByColor  (0, 0, vid.conwidth, vid.conheight, 1, 1, 1, 200);
 }
 
 /*
diff --git a/source/gl_screen.c b/source/gl_screen.c
index c2ee07b..a4470f5 100644
--- a/source/gl_screen.c
+++ b/source/gl_screen.c
@@ -1934,8 +1934,6 @@ int original_view_fov;
 void SCR_UpdateScreen (void)
 {
 	vid.numpages = (gl_triplebuffer.value) ? 3 : 2;
-	
-	scr_copytop = 0;
 
 	//screen is disabled for loading, and we don't have any loading steps...?
 	if (scr_disabled_for_loading  && !loading_num_step)
@@ -1952,6 +1950,8 @@ void SCR_UpdateScreen (void)
 	if (!scr_initialized || !con_initialized)
 		return;				// not initialized yet
 
+	scr_copytop = 0;
+	
 	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
 
 
@@ -2041,22 +2041,50 @@ void SCR_UpdateScreen (void)
 	//FIXME: only call this when needed
 	SCR_TileClear ();
 
-	SCR_DrawCrosshair (); //johnfitz
-	SCR_DrawRam ();
-	SCR_DrawNet ();
-	SCR_DrawTurtle ();
-	SCR_DrawPause ();
-	SCR_CheckDrawCenterString ();
-	SCR_CheckDrawUseString ();
-	SCR_DrawDevStats (); //johnfitz
-	HUD_Draw ();
-	SCR_DrawFPS (); //johnfitz
-	SCR_DrawClock (); //johnfitz
-	SCR_DrawConsole ();
-	M_Draw ();
-	
-	if(scr_loadscreen.value)
-	SCR_DrawLoadScreen();
+	if (scr_drawdialog) //new game confirm
+	{
+		if (con_forcedup)
+			Draw_ConsoleBackground ();
+		// else
+		// 	Sbar_Draw ();
+		Draw_FadeScreen ();
+		SCR_DrawNotifyString ();
+	}
+	else if (scr_drawloading) //loading
+	{
+		SCR_DrawLoading ();
+		// Sbar_Draw ();
+	}
+	else if (cl.intermission == 1 && key_dest == key_game) //end of level
+	{
+		Sbar_IntermissionOverlay ();
+	}
+	else if (cl.intermission == 2 && key_dest == key_game) //end of episode
+	{
+		Sbar_FinaleOverlay ();
+		SCR_CheckDrawCenterString ();
+	}
+	else
+	{
+		SCR_DrawCrosshair (); //johnfitz
+		SCR_DrawRam ();
+		SCR_DrawNet ();
+		SCR_DrawTurtle ();
+		SCR_DrawPause ();
+		SCR_CheckDrawCenterString ();
+		SCR_CheckDrawUseString ();
+		SCR_DrawDevStats (); //johnfitz
+		HUD_Draw ();
+		SCR_DrawFPS (); //johnfitz
+		SCR_DrawClock (); //johnfitz
+		SCR_DrawConsole ();
+		M_Draw ();
+		
+		if(scr_loadscreen.value)
+		{
+			SCR_DrawLoadScreen();
+		}
+	}
 
 	Draw_LoadingFill();