diff --git a/Effects/building.eff b/Effects/building.eff
index 7abd7b934..f50968f0a 100644
--- a/Effects/building.eff
+++ b/Effects/building.eff
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
 	<name>Effects/building</name>
-	<inherits-from>Effects/model-default</inherits-from>	
+	<inherits-from>Effects/model-default</inherits-from>
 	<parameters>
 		<texture n="0">
 		  <active>true</active>
@@ -9,7 +9,7 @@
 		  <internal-format>normalized</internal-format>
 		  <filter>linear-mipmap-linear</filter>
 		  <wrap-s>clamp</wrap-s>
-		  <wrap-t>clamp</wrap-t>		
+		  <wrap-t>clamp</wrap-t>
 		</texture>
 		<texture n="1">
 		  <active>true</active>
@@ -17,15 +17,15 @@
 		  <internal-format>normalized</internal-format>
 		  <filter>linear-mipmap-linear</filter>
 		  <wrap-s>clamp</wrap-s>
-		  <wrap-t>clamp</wrap-t>		
-		</texture>		
+		  <wrap-t>clamp</wrap-t>
+		</texture>
 		<transparent>false</transparent>
 		<material>
 		  <active>true</active>
 			<color-mode-uniform>1</color-mode-uniform>
-      <ambient type="vec4d">0.6 0.6 0.6 1.0</ambient>			
-      <diffuse type="vec4d">1.0 1.0 1.0 1.0</diffuse>			
-      <specular type="vec4d">0.0 0.0 0.0 1.0</specular>			
+      <ambient type="vec4d">0.6 0.6 0.6 1.0</ambient>
+      <diffuse type="vec4d">1.0 1.0 1.0 1.0</diffuse>
+      <specular type="vec4d">0.0 0.0 0.0 1.0</specular>
       <emissive type="vec4d">0.02 0.02 0.02 1.0</emissive>
       <shininess>0.0</shininess>
       <color-mode>ambient-and-diffuse</color-mode>
@@ -66,8 +66,8 @@
 		  <use>/sim/time/sun-angle-rad</use>
     </sun-angle>
 	</parameters>
-	
-	<!-- Override some of the default shaders so we can add emissive lighting -->	
+
+	<!-- Override some of the default shaders so we can add emissive lighting -->
 	<!-- Skydome -->
   <technique n="5">
     <pass n="0">
@@ -77,7 +77,7 @@
       </program>
     </pass>
   </technique>
-  
+
   <!-- Rembrandt -->
   <technique n="10">
   	<pass n="0">
@@ -88,9 +88,9 @@
 		  </program>
     </pass>
   </technique>
-  
+
   <!-- Default shader -->
-  <technique n="11">  
+  <technique n="11">
 	  <pass n="0">
 			<texture-unit n="1">
 				<!-- Emissive texture-->
@@ -117,9 +117,9 @@
           <use>texture[1]/internal-format</use>
         </internal-format>
         -->
-			</texture-unit>	  
+			</texture-unit>
 		  <program n="0">
-				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<!--fog include-->
 				<vertex-shader n="1">Shaders/default.vert</vertex-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
diff --git a/Effects/landmass.eff b/Effects/landmass.eff
index b4f49161d..aaa0d920e 100644
--- a/Effects/landmass.eff
+++ b/Effects/landmass.eff
@@ -258,7 +258,7 @@
 				</internal-format>
 			</texture-unit>
 			<program>
-				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<vertex-shader n="1">Shaders/landmass-g.vert</vertex-shader>
 				<geometry-shader>Shaders/landmass.geom</geometry-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
@@ -457,7 +457,7 @@
 				</internal-format>
 			</texture-unit>
 			<program>
-				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<vertex-shader n="1">Shaders/landmass.vert</vertex-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
 				<fragment-shader n="1">Shaders/landmass.frag</fragment-shader>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index f5df75097..c4ab897b4 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -303,7 +303,7 @@
 				<use>vertex-program-two-side</use>
 			</vertex-program-two-side>
 			<program>
-				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<!--fog include-->
 				<vertex-shader n="1">Shaders/default.vert</vertex-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
diff --git a/Effects/tree.eff b/Effects/tree.eff
index ad27ae4f4..c1bd27686 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -162,7 +162,7 @@
 			</uniform>
 			<!-- 			END fog include -->
 		</pass>
-		
+
     <pass n="1">
 			<lighting>true</lighting>
 			<material>
@@ -195,7 +195,7 @@
 				<wrap-t>clamp</wrap-t>
 			</texture-unit>
 			<program>
-				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<vertex-shader n="1">Shaders/tree.vert</vertex-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
 				<fragment-shader n="1">Shaders/tree.frag</fragment-shader>
diff --git a/Effects/urban.eff b/Effects/urban.eff
index 4ed75d233..90a20b3d1 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -735,7 +735,7 @@
 				<type>noise</type>
 			</texture-unit>
 			<program>
-				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
+<!-- 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
 				<vertex-shader n="1">Shaders/urban.vert</vertex-shader>
 				<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
 				<fragment-shader n="1">Shaders/urban.frag</fragment-shader>
diff --git a/Shaders/ubershader-gbuffer.frag b/Shaders/ubershader-gbuffer.frag
index a39040583..905fd40c2 100644
--- a/Shaders/ubershader-gbuffer.frag
+++ b/Shaders/ubershader-gbuffer.frag
@@ -133,7 +133,7 @@ void main (void)
  	//////////////////////////////////////////////////////////////////////
 	if (dirt_enabled > 0.0){
 		vec3 dirtFactorIn = vec3 (dirt_r_factor, dirt_g_factor, dirt_b_factor);
-		vec3 dirtFactor.rgb = reflmap.rgb * dirtFactorIn.rgb;
+		vec3 dirtFactor = reflmap.rgb * dirtFactorIn.rgb;
 		//dirtFactor.r = smoothstep(0.0, 1.0, dirtFactor.r);
 		mixedcolor.rgb = mix(mixedcolor.rgb, dirt_r_color, smoothstep(0.0, 1.0, dirtFactor.r));
 		if (dirt_multi > 0) {