diff --git a/r_edge.c b/r_edge.c
index e6251b03..59443524 100644
--- a/r_edge.c
+++ b/r_edge.c
@@ -920,10 +920,10 @@ void D_TurbulentSurf (surf_t *s)
 //============
 //PGM
 	// textures that aren't warping are just flowing. Use NonTurbulent8 instead
-#if 1
-	NonTurbulent8 (s->spans);
+#if 0
+	Turbulent8 (s->spans);
 #else
-	if(!(pface->texinfo->flags & SURF_DRAWTURB))
+	if(!(pface->flags & SURF_DRAWTURB))
 		NonTurbulent8 (s->spans);
 	else
 		Turbulent8 (s->spans);
@@ -1123,7 +1123,12 @@ void D_DrawSurfaces (void)
 
 			r_drawnpolycount++;
 #if 1
-			D_SolidSurf (s);
+			if(s->flags & SURF_DRAWSKY)
+				D_BackgroundSurf (s);
+			else if (s->flags & SURF_DRAWTURB)
+				D_TurbulentSurf (s);
+			else
+				D_SolidSurf (s);
 #else
 			if (! (s->flags & (SURF_DRAWSKYBOX|SURF_DRAWBACKGROUND|SURF_DRAWTURB) ) )
 				D_SolidSurf (s);
diff --git a/r_main.c b/r_main.c
index 08249aab..8bd9e029 100644
--- a/r_main.c
+++ b/r_main.c
@@ -1912,7 +1912,7 @@ qboolean R_Init()
 
 //	sw_aliasstats = ri.Cvar_Get ("sw_polymodelstats", "0", 0);
 //	sw_allow_modex = ri.Cvar_Get( "sw_allow_modex", "1", CVAR_ARCHIVE );
-	sw_clearcolor = gEngfuncs.Cvar_Get ("sw_clearcolor", "2", 0, "screen clear color");
+	sw_clearcolor = gEngfuncs.Cvar_Get ("sw_clearcolor", "48999", 0, "screen clear color");
 	sw_drawflat = gEngfuncs.Cvar_Get ("sw_drawflat", "0", 0, "");
 	sw_draworder = gEngfuncs.Cvar_Get ("sw_draworder", "0", 0, "");
 	sw_maxedges = gEngfuncs.Cvar_Get ("sw_maxedges", "32", 0, "");
diff --git a/r_rast.c b/r_rast.c
index 9b6b2b25..fee7619c 100644
--- a/r_rast.c
+++ b/r_rast.c
@@ -544,7 +544,7 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 	{
 		//fa->nextalphasurface = r_alpha_surfaces;
 		//r_alpha_surfaces = fa;
-		return;
+		//return;
 	}
 
 	// sky surfaces encountered in the world will cause the
@@ -552,7 +552,7 @@ void R_RenderFace (msurface_t *fa, int clipflags)
 	if ( fa->flags & SURF_DRAWSKY )
 	{
 		//R_EmitSkyBox ();
-		return;
+	//	return;
 	}
 
 // skip out if no more surfs