diff --git a/.gitignore b/.gitignore
index 172a7adc6..343565935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,5 @@ config.cfg
 /sp/src/game/server/Debug_gstringv2
 /sp/src/vgui2/vgui_controls/Release
 /sp/src/game/client/Release_gstringv2
+
+/sp/src/game/server/Release_gstringv2
diff --git a/sp/src/game/client/flashlighteffect.cpp b/sp/src/game/client/flashlighteffect.cpp
index 671cb9af2..49689c495 100644
--- a/sp/src/game/client/flashlighteffect.cpp
+++ b/sp/src/game/client/flashlighteffect.cpp
@@ -40,13 +40,13 @@ static ConVar r_flashlightoffsetx( "r_flashlightoffsetx", "10.0", FCVAR_CHEAT );
 static ConVar r_flashlightoffsety( "r_flashlightoffsety", "-20.0", FCVAR_CHEAT );
 static ConVar r_flashlightoffsetz( "r_flashlightoffsetz", "24.0", FCVAR_CHEAT );
 static ConVar r_flashlightnear( "r_flashlightnear", "4.0", FCVAR_CHEAT );
-static ConVar r_flashlightfar( "r_flashlightfar", "750.0", FCVAR_CHEAT );
+static ConVar r_flashlightfar( "r_flashlightfar", "500.0", FCVAR_CHEAT );
 static ConVar r_flashlightconstant( "r_flashlightconstant", "0.0", FCVAR_CHEAT );
-static ConVar r_flashlightlinear( "r_flashlightlinear", "100.0", FCVAR_CHEAT );
-static ConVar r_flashlightquadratic( "r_flashlightquadratic", "0.0", FCVAR_CHEAT );
+static ConVar r_flashlightlinear( "r_flashlightlinear", "25.0", FCVAR_CHEAT );
+static ConVar r_flashlightquadratic( "r_flashlightquadratic", "5000.0", FCVAR_CHEAT );
 static ConVar r_flashlightvisualizetrace( "r_flashlightvisualizetrace", "0", FCVAR_CHEAT );
 static ConVar r_flashlightambient( "r_flashlightambient", "0.0", FCVAR_CHEAT );
-static ConVar r_flashlightshadowatten( "r_flashlightshadowatten", "0.35", FCVAR_CHEAT );
+static ConVar r_flashlightshadowatten( "r_flashlightshadowatten", "1", FCVAR_CHEAT );
 static ConVar r_flashlightladderdist( "r_flashlightladderdist", "40.0", FCVAR_CHEAT );
 static ConVar mat_slopescaledepthbias_shadowmap( "mat_slopescaledepthbias_shadowmap", "16", FCVAR_CHEAT );
 static ConVar mat_depthbias_shadowmap(	"mat_depthbias_shadowmap", "0.0005", FCVAR_CHEAT  );
diff --git a/sp/src/game/client/gstring/c_gstring_player.cpp b/sp/src/game/client/gstring/c_gstring_player.cpp
index 2ce0ef7d1..8f3ef4dd2 100644
--- a/sp/src/game/client/gstring/c_gstring_player.cpp
+++ b/sp/src/game/client/gstring/c_gstring_player.cpp
@@ -121,8 +121,11 @@ void C_GstringPlayer::OverrideView( CViewSetup *pSetup )
 	if ( amt > 0.0f )
 	{
 		float sine = sin( gpGlobals->curtime * 10.0f ) * amt;
+		float sineY = sin( gpGlobals->curtime * 5.0f + M_PI * 0.5f ) * amt;
+
 		pSetup->origin += Vector( 0, 0, 1.0f ) * sine;
 		pSetup->angles.x += sine * 1.0f;
+		pSetup->angles.y += sineY * 2.0f;
 	}
 
 	if ( amtSide != 0.0f )
@@ -135,19 +138,25 @@ void C_GstringPlayer::ProcessMuzzleFlashEvent()
 {
 	//BaseClass::ProcessMuzzleFlashEvent();
 
-	m_flMuzzleFlashDuration = RandomFloat( 0.035f, 0.07f );
+	m_flMuzzleFlashDuration = RandomFloat( 0.025f, 0.045f );
 	m_flMuzzleFlashTime = gpGlobals->curtime + m_flMuzzleFlashDuration;
 }
 
 void C_GstringPlayer::UpdateFlashlight()
 {
-	const bool bDoMuzzleflash = m_flMuzzleFlashTime > gpGlobals->curtime;
+	const bool bDoMuzzleflash = m_flMuzzleFlashTime > gpGlobals->curtime || m_flMuzzleFlashDuration > 0.0f;
 	const bool bDoFlashlight = !bDoMuzzleflash && IsEffectActive( EF_DIMLIGHT );
 
 	Vector vecForward, vecRight, vecUp, vecPos;
 	vecPos = EyePosition();
 	EyeVectors( &vecForward, &vecRight, &vecUp );
 
+	if ( m_flMuzzleFlashTime <= gpGlobals->curtime
+		&& m_flMuzzleFlashDuration > 0.0f )
+	{
+		m_flMuzzleFlashDuration = 0.0f;
+	}
+
 	if ( bDoFlashlight || bDoMuzzleflash )
 	{
 		ConVarRef scissor( "r_flashlightscissor" );
diff --git a/sp/src/game/client/gstring/c_muzzleflash_effect.cpp b/sp/src/game/client/gstring/c_muzzleflash_effect.cpp
index 70260a4c2..737f3b7ec 100644
--- a/sp/src/game/client/gstring/c_muzzleflash_effect.cpp
+++ b/sp/src/game/client/gstring/c_muzzleflash_effect.cpp
@@ -37,8 +37,8 @@ void C_MuzzleflashEffect::UpdateLight( const Vector &vecPos, const Vector &vecDi
 	state.m_fVerticalFOVDegrees = state.m_fHorizontalFOVDegrees = 100.0f + 40.0f * flStrength;
 	state.m_fConstantAtten = 0.0f;
 	state.m_Color[0] = 1.0f;
-	state.m_Color[1] = 1.0f;
-	state.m_Color[2] = 1.0f;
+	state.m_Color[1] = 0.7f;
+	state.m_Color[2] = 0.3f;
 	state.m_Color[3] = 0.0f;
 	state.m_NearZ = 5.0f;	// Push near plane out so that we don't clip the world when the flashlight pulls back 
 	state.m_FarZ = 500.0f;
diff --git a/sp/src/game/shared/movevars_shared.cpp b/sp/src/game/shared/movevars_shared.cpp
index bb3eb04ba..cda2406cf 100644
--- a/sp/src/game/shared/movevars_shared.cpp
+++ b/sp/src/game/shared/movevars_shared.cpp
@@ -80,8 +80,8 @@ ConVar	sv_waterfriction(  "sv_waterfriction", "1", FCVAR_NOTIFY | FCVAR_REPLICAT
 ConVar	sv_footsteps	( "sv_footsteps", "1", FCVAR_NOTIFY | FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY, "Play footstep sound for players" );
 #if defined( GSTRING ) // GSTRINGMIGRATION
 // Let's re-eanble that good old effect from Quake. :)
-ConVar sv_rollspeed ( "sv_rollspeed", "40.0f", FCVAR_CHEAT | FCVAR_REPLICATED );
-ConVar sv_rollangle ( "sv_rollangle", "1.2f", FCVAR_CHEAT | FCVAR_REPLICATED, "Max view roll angle" );
+ConVar sv_rollspeed ( "sv_rollspeed", "550.0", FCVAR_CHEAT | FCVAR_REPLICATED );
+ConVar sv_rollangle ( "sv_rollangle", "3", FCVAR_CHEAT | FCVAR_REPLICATED, "Max view roll angle" );
 #else
 ConVar	sv_rollspeed	( "sv_rollspeed", "200", FCVAR_NOTIFY | FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY);
 ConVar	sv_rollangle	( "sv_rollangle", "0", FCVAR_NOTIFY | FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY, "Max view roll angle");
diff --git a/sp/src/lib/public/mathlib.lib b/sp/src/lib/public/mathlib.lib
index 7dc54dfde..dff849e6a 100644
Binary files a/sp/src/lib/public/mathlib.lib and b/sp/src/lib/public/mathlib.lib differ
diff --git a/sp/src/lib/public/raytrace.lib b/sp/src/lib/public/raytrace.lib
index d70e58c4d..ebb8b08a5 100644
Binary files a/sp/src/lib/public/raytrace.lib and b/sp/src/lib/public/raytrace.lib differ
diff --git a/sp/src/lib/public/tier1.lib b/sp/src/lib/public/tier1.lib
index 9ba843cf6..4ced45257 100644
Binary files a/sp/src/lib/public/tier1.lib and b/sp/src/lib/public/tier1.lib differ
diff --git a/sp/src/lib/public/vgui_controls.lib b/sp/src/lib/public/vgui_controls.lib
index 2ba408297..af0ed38db 100644
Binary files a/sp/src/lib/public/vgui_controls.lib and b/sp/src/lib/public/vgui_controls.lib differ