diff --git a/src/client/NSView.qc b/src/client/NSView.qc
index 901f71ad..6e415084 100644
--- a/src/client/NSView.qc
+++ b/src/client/NSView.qc
@@ -14,6 +14,8 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+var bool autocvar_r_skipWorld = false;
+
 void
 NSView::NSView(void)
 {
@@ -31,7 +33,12 @@ NSView::SetupView(void)
 {
 	setproperty(VF_DRAWENGINESBAR, (float)0);
 	setproperty(VF_DRAWCROSSHAIR, (float)0);
-	setproperty(VF_DRAWWORLD, (float)1);
+
+	if (g_cheats == true)
+		setproperty(VF_DRAWWORLD, autocvar_r_skipWorld ? false : true);
+	else
+		setproperty(VF_DRAWWORLD, (float)1);
+
 	setproperty(VF_ACTIVESEAT, (float)m_iSeat);
 	setproperty(VF_MIN, m_vecPosition);
 	setproperty(VF_SIZE, m_vecSize);
@@ -53,6 +60,7 @@ NSView::SetupView(void)
 		setproperty(VF_ORIGIN, origin);
 		//setproperty(VF_CL_VIEWANGLES, angles);
 		setproperty(VF_ANGLES, angles);
+		pSeat->m_flCameraTime = 0.0f;
 	}
 
 	/* the view may not have gotten the chance to set the client angle early on */
diff --git a/src/client/defs.h b/src/client/defs.h
index 9dbf6cb8..82dc6f7f 100644
--- a/src/client/defs.h
+++ b/src/client/defs.h
@@ -25,6 +25,7 @@
 #include "crosshair.h"
 
 var bool g_net_debug = false;
+var bool g_cheats = false;
 
 #define PRINTFLAG(x) if (cvar("net_showUpdates") || g_net_debug) \
 	print(sprintf("%f %s read update %s\n", time, classname, #x));
diff --git a/src/client/entry.qc b/src/client/entry.qc
index 2de1c0d7..a5b3e77e 100644
--- a/src/client/entry.qc
+++ b/src/client/entry.qc
@@ -84,6 +84,8 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
 	else
 		cvar_set("_menu_singleplayer", "0");
 
+	g_cheats = (serverkey("*cheats") == "ON") ? true : false;
+
 	WorldSpawn_Init();
 
 	/* end msg */
diff --git a/src/gs-entbase/shared/ambient_generic.qc b/src/gs-entbase/shared/ambient_generic.qc
index 4fa6eb69..7002aa65 100644
--- a/src/gs-entbase/shared/ambient_generic.qc
+++ b/src/gs-entbase/shared/ambient_generic.qc
@@ -424,10 +424,8 @@ ambient_generic::ReceiveEntity(float isnew, float flChanged)
 
 	if (m_bLoops == true) {
 		if (flChanged & AMBIENT_MODERN) {
-			print("MODERN!\n");
 			Sound_Update(this, CHAN_BODY, Sound_GetID(m_strActivePath), m_flVolume);
 		} else {
-			print("OLD!\n");
 			soundupdate(this, CHAN_BODY, 
 				m_strActivePath, m_flVolume, m_flRadius, m_flPitch, 0, 0);
 		}