diff --git a/CMDS b/CMDS
index 0d2c01c..7a0a0e9 100644
--- a/CMDS
+++ b/CMDS
@@ -16,6 +16,8 @@
 +showscores
 +speed
 +strafe
++tiltleft
++tiltright
 +use
 -attack
 -back
@@ -35,6 +37,8 @@
 -showscores
 -speed
 -strafe
+-tiltleft
+-tiltright
 -use
 addbot
 alias
@@ -107,9 +111,10 @@ nvs_max_server
 nvs_request
 path
 pause
+demo_pause
 ping
 play
-playdemo
+demo_play
 playvol
 pointfile
 port
@@ -118,7 +123,7 @@ profile
 qcexec
 quit
 reconnect
-record
+demo_record
 restart
 save
 say
@@ -132,13 +137,14 @@ soundlist
 spawn
 startdemos
 status
-stop
+demo_stop
 stopdemo
 stopsound
 stuffcmds
 tell
-test
-test2
+net_test
+net_test2
+tiltreset
 timedemo
 timerefresh
 toggleconsole
diff --git a/CVARS b/CVARS
index a6b4ab5..797dc2b 100644
--- a/CVARS
+++ b/CVARS
@@ -140,6 +140,8 @@ lookspring
 lookstrafe
 m_filter
 m_forward
+m_lockup
+m_lockdown
 m_look
 m_pitch
 m_side
diff --git a/engine/cl_main.c b/engine/cl_main.c
index de68284..bfb4929 100644
--- a/engine/cl_main.c
+++ b/engine/cl_main.c
@@ -1284,17 +1284,12 @@ void CL_Init (void)
 //
 // register our commands
 //
-// 2001-09-18 New cvar system by Maddes (Init)  start
-// 2001-09-18 New cvar system by Maddes (Init)  end
-
-//	Cvar_RegisterVariable (&cl_autofire);
-
 	Cmd_AddCommand ("entities", CL_PrintEntities_f);
 	Cmd_AddCommand ("disconnect", CL_Disconnect_f);
-	Cmd_AddCommand ("record", CL_Record_f);
-	Cmd_AddCommand ("pausedemo", CL_DemoPause_f);
-	Cmd_AddCommand ("stop", CL_Stop_f);
-	Cmd_AddCommand ("playdemo", CL_PlayDemo_f);
-	Cmd_AddCommand ("timedemo", CL_TimeDemo_f);
+	Cmd_AddCommand ("demo_record", CL_Record_f);
+	Cmd_AddCommand ("demo_pause", CL_DemoPause_f);
+	Cmd_AddCommand ("demo_stop", CL_Stop_f);
+	Cmd_AddCommand ("demo_play", CL_PlayDemo_f);
+	Cmd_AddCommand ("demo_time", CL_TimeDemo_f);
 	Cmd_AddCommand ("ng_forceloadlighting", TheForceLoadLighting);
 }
diff --git a/engine/pr_cmds.c b/engine/pr_cmds.c
index 27f033d..db9c303 100644
--- a/engine/pr_cmds.c
+++ b/engine/pr_cmds.c
@@ -3681,19 +3681,12 @@ ebfs_builtin_t pr_ebfs_builtins[] =
 	{ PR_DEFAULT_FUNCNO_BUILTIN_FIND, "builtin_find", PF_builtin_find },		// 2001-09-14 Enhanced BuiltIn Function System (EBFS) by Maddes
 
 	{ 101, "cmd_find", PF_cmd_find },		// 2001-09-16 New BuiltIn Function: cmd_find() by Maddes
-
 	{ 102, "cvar_find", PF_cvar_find },		// 2001-09-16 New BuiltIn Function: cvar_find() by Maddes
-
 	{ 103, "cvar_string", PF_cvar_string },	// 2001-09-16 New BuiltIn Function: cvar_string() by Maddes
-
 	{ 105, "cvar_free", PF_cvar_free },		// 2001-09-18 New BuiltIn Function: cvar_free() by Maddes
-
 	{ 106, "NVS_InitSVCMsg", PF_NVS_InitSVCMsg },	// 2000-05-02 NVS SVC by Maddes
-
 	{ 107, "WriteFloat", PF_WriteFloat },	// 2001-09-16 New BuiltIn Function: WriteFloat() by Maddes
-
 	{ 108, "etof", PF_etof },	// 2001-09-25 New BuiltIn Function: etof() by Maddes
-
 	{ 109, "ftoe", PF_ftoe },	// 2001-09-25 New BuiltIn Function: ftoe() by Maddes
 
 // 2001-09-20 QuakeC file access by FrikaC/Maddes  start
diff --git a/network/net_dgrm.c b/network/net_dgrm.c
index 82b9906..5595d50 100644
--- a/network/net_dgrm.c
+++ b/network/net_dgrm.c
@@ -792,8 +792,8 @@ int Datagram_Init (void)
 #ifdef BAN_TEST
 	Cmd_AddCommand ("ban", NET_Ban_f);
 #endif
-	Cmd_AddCommand ("test", Test_f);
-	Cmd_AddCommand ("test2", Test2_f);
+	Cmd_AddCommand ("net_test", Test_f);
+	Cmd_AddCommand ("net_test2", Test2_f);
 
 	return 0;
 }
diff --git a/renderer/d_scan.c b/renderer/d_scan.c
index 37fa750..975b8f9 100644
--- a/renderer/d_scan.c
+++ b/renderer/d_scan.c
@@ -196,7 +196,6 @@ void D_WarpScreen (void)
 	w = r_refdef.vrect.width;
 	h = r_refdef.vrect.height;
 
-	printf("THIS IS HAPPENING BTW\n");
 	wratio = w / (float)scr_vrect.width;
 	hratio = h / (float)scr_vrect.height;
 
diff --git a/renderer/r_part.c b/renderer/r_part.c
index 4421fde..394c57c 100644
--- a/renderer/r_part.c
+++ b/renderer/r_part.c
@@ -4304,8 +4304,6 @@ void R_DrawFlares (void)
 	int			liftoff;
 	int			amiseen;
 
-	
-
 	VectorScale (vright, xscaleshrink, r_pright);
 	VectorScale (vup, yscaleshrink, r_pup);
 	VectorCopy (vpn, r_ppn);