diff --git a/Makefile b/Makefile
index 30a4ac4..52eb68b 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ NGUNIX_OBJS = \
 	$(BUILDDIR)/cl_main.o \
 	$(BUILDDIR)/cl_parse.o \
 	$(BUILDDIR)/cl_tent.o \
-	$(BUILDDIR)/chase.o \
+	$(BUILDDIR)/cl_chase.o \
 	$(BUILDDIR)/cmd.o \
 	$(BUILDDIR)/common.o \
 	$(BUILDDIR)/console.o \
@@ -353,7 +353,7 @@ $(BUILDDIR)/cl_parse.o : $(MOUNT_DIR)/cl_parse.c
 $(BUILDDIR)/cl_tent.o :  $(MOUNT_DIR)/cl_tent.c
 	$(DO_CC)
 
-$(BUILDDIR)/chase.o :    $(MOUNT_DIR)/chase.c
+$(BUILDDIR)/cl_chase.o :    $(MOUNT_DIR)/cl_chase.c
 	$(DO_CC)
 
 $(BUILDDIR)/cmd.o :      $(MOUNT_DIR)/cmd.c
diff --git a/asm/d_copy.s b/asm/d_copy.s
index 7d84147..6860272 100644
--- a/asm/d_copy.s
+++ b/asm/d_copy.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 	.data
diff --git a/asm/d_draw.s b/asm/d_draw.s
index 9eb26c6..e355956 100644
--- a/asm/d_draw.s
+++ b/asm/d_draw.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/d_draw16.s b/asm/d_draw16.s
index 094d948..26889ec 100644
--- a/asm/d_draw16.s
+++ b/asm/d_draw16.s
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/d_fog16.s b/asm/d_fog16.s
index e74afb6..2019f3d 100644
--- a/asm/d_fog16.s
+++ b/asm/d_fog16.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/d_parta.s b/asm/d_parta.s
index dbac16b..8f8e910 100644
--- a/asm/d_parta.s
+++ b/asm/d_parta.s
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "d_ifacea.h"
 #include "asm_draw.h"
 
diff --git a/asm/d_polysa.s b/asm/d_polysa.s
index 33d81f9..3b7a173 100644
--- a/asm/d_polysa.s
+++ b/asm/d_polysa.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/d_scana.s b/asm/d_scana.s
index b2b3348..df830f8 100644
--- a/asm/d_scana.s
+++ b/asm/d_scana.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/d_spr8.s b/asm/d_spr8.s
index 973537a..ec4bb9f 100644
--- a/asm/d_spr8.s
+++ b/asm/d_spr8.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if id386
diff --git a/asm/d_varsa.s b/asm/d_varsa.s
index be9aed7..4681882 100644
--- a/asm/d_varsa.s
+++ b/asm/d_varsa.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/math.s b/asm/math.s
index e45ce72..53a08e2 100644
--- a/asm/math.s
+++ b/asm/math.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 
 
 #if	id386
diff --git a/asm/r_aclipa.s b/asm/r_aclipa.s
index c0b4f5b..6e0147c 100644
--- a/asm/r_aclipa.s
+++ b/asm/r_aclipa.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/r_aliasa.s b/asm/r_aliasa.s
index e5d26e7..c75014d 100644
--- a/asm/r_aliasa.s
+++ b/asm/r_aliasa.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/r_drawa.s b/asm/r_drawa.s
index dfb6f2b..d9a4dd0 100644
--- a/asm/r_drawa.s
+++ b/asm/r_drawa.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/r_edgea.s b/asm/r_edgea.s
index 48c0d94..16d9a9c 100644
--- a/asm/r_edgea.s
+++ b/asm/r_edgea.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386broken
diff --git a/asm/r_varsa.s b/asm/r_varsa.s
index 500c6b3..b8b174e 100644
--- a/asm/r_varsa.s
+++ b/asm/r_varsa.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
diff --git a/asm/snd_mixa.s b/asm/snd_mixa.s
index 993fcd9..264858c 100644
--- a/asm/snd_mixa.s
+++ b/asm/snd_mixa.s
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 
 #if	id386
 
diff --git a/asm/surf16.s b/asm/surf16.s
index 7e5cc6b..1f8d27e 100644
--- a/asm/surf16.s
+++ b/asm/surf16.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if id386
diff --git a/asm/surf8.s b/asm/surf8.s
index 4142c69..8410a39 100644
--- a/asm/surf8.s
+++ b/asm/surf8.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386
diff --git a/asm/surf8b.s b/asm/surf8b.s
index 926a145..0b5523d 100644
--- a/asm/surf8b.s
+++ b/asm/surf8b.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386
diff --git a/asm/surf8fst.s b/asm/surf8fst.s
index a290387..50c620c 100644
--- a/asm/surf8fst.s
+++ b/asm/surf8fst.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386
diff --git a/asm/surf8g.s b/asm/surf8g.s
index e46b287..55f5471 100644
--- a/asm/surf8g.s
+++ b/asm/surf8g.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386
diff --git a/asm/surf8r.s b/asm/surf8r.s
index 3adf564..a4ac7ce 100644
--- a/asm/surf8r.s
+++ b/asm/surf8r.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386
diff --git a/asm/surf8rgb.s b/asm/surf8rgb.s
index 397578f..1cdd5bc 100644
--- a/asm/surf8rgb.s
+++ b/asm/surf8rgb.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 
 #if	id386
diff --git a/asm/sys_dosa.s b/asm/sys_dosa.s
index f009bf4..732af7d 100644
--- a/asm/sys_dosa.s
+++ b/asm/sys_dosa.s
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 
 
 	.data
diff --git a/asm/sys_wina.s b/asm/sys_wina.s
index 58dba40..bc3b6ed 100644
--- a/asm/sys_wina.s
+++ b/asm/sys_wina.s
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 
 // LATER should be id386-dependent, and have an equivalent C path
 
diff --git a/asm/worlda.s b/asm/worlda.s
index c719d6b..161d77b 100644
--- a/asm/worlda.s
+++ b/asm/worlda.s
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 //#include "d_ifacea.h"	//don't include unneeded defs	// 2001-12-28 Merged assembler files of Quake and QuakeWorld by Maddes
 
 #if id386
diff --git a/engine/chase.c b/engine/cl_chase.c
similarity index 100%
rename from engine/chase.c
rename to engine/cl_chase.c
diff --git a/engine/cl_demo.c b/engine/cl_demo.c
index bf25ea0..6f0b338 100644
--- a/engine/cl_demo.c
+++ b/engine/cl_demo.c
@@ -309,7 +309,7 @@ void CL_PlayDemo_f (void)
 
 	if (Cmd_Argc() != 2)
 	{
-		Con_Printf ("playdemo <demoname> : plays a demo\n");	// 2000-01-21 Typo correction by Maddes
+		Con_Printf ("demo_play <demoname> : plays a demo\n");	// 2000-01-21 Typo correction by Maddes
 		return;
 	}
 
diff --git a/engine/cl_input.c b/engine/cl_input.c
index c10aad2..f3c028e 100644
--- a/engine/cl_input.c
+++ b/engine/cl_input.c
@@ -295,10 +295,10 @@ void CL_AdjustAngles (void)
 	if (up || down)
 		V_StopPitchDrift ();
 
-	if (cl.viewangles[PITCH] > 90)
-		cl.viewangles[PITCH] = 90;
-	if (cl.viewangles[PITCH] < -90)
-		cl.viewangles[PITCH] = -90;
+	if (cl.viewangles[PITCH] > (int)m_lockdown->value)
+		cl.viewangles[PITCH] = (int)m_lockdown->value;
+	if (cl.viewangles[PITCH] < (int)m_lockup->value)
+		cl.viewangles[PITCH] = (int)m_lockup->value;
 
 }
 
diff --git a/engine/cl_main.c b/engine/cl_main.c
index bfb4929..54ef844 100644
--- a/engine/cl_main.c
+++ b/engine/cl_main.c
@@ -303,7 +303,7 @@ void CL_NextDemo (void)
 		}
 	}
 
-	sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]);
+	sprintf (str,"demo_play %s\n", cls.demos[cls.demonum]);
 	Cbuf_InsertText (str);
 	cls.demonum++;
 }
diff --git a/engine/cmd.c b/engine/cmd.c
index 87830bb..f075c22 100644
--- a/engine/cmd.c
+++ b/engine/cmd.c
@@ -501,7 +501,7 @@ void Cmd_Init (void)
 Cmd_Argc
 ============
 */
-int		Cmd_Argc (void)
+int Cmd_Argc (void)
 {
 	return cmd_argc;
 }
@@ -511,7 +511,7 @@ int		Cmd_Argc (void)
 Cmd_Argv
 ============
 */
-char	*Cmd_Argv (int arg)
+char *Cmd_Argv (int arg)
 {
 	if ( (unsigned)arg >= cmd_argc )
 		return cmd_null_string;
@@ -523,7 +523,7 @@ char	*Cmd_Argv (int arg)
 Cmd_Args
 ============
 */
-char		*Cmd_Args (void)
+char *Cmd_Args (void)
 {
 	return cmd_args;
 }
@@ -587,7 +587,7 @@ void Cmd_TokenizeString (char *text)
 Cmd_AddCommand
 ============
 */
-void	Cmd_AddCommand (char *cmd_name, xcommand_t function)
+void Cmd_AddCommand (char *cmd_name, xcommand_t function)
 {
 	cmd_function_t	*cmd;
 
@@ -627,7 +627,7 @@ void	Cmd_AddCommand (char *cmd_name, xcommand_t function)
 Cmd_Exists
 ============
 */
-qboolean	Cmd_Exists (char *cmd_name)
+qboolean Cmd_Exists (char *cmd_name)
 {
 	cmd_function_t	*cmd;
 
@@ -884,7 +884,7 @@ A complete command line has been parsed, so try to execute it
 FIXME: lookupnoadd the token to speed search?
 ============
 */
-void	Cmd_ExecuteString (char *text, cmd_source_t src)
+void Cmd_ExecuteString (char *text, cmd_source_t src)
 {
 	cmd_function_t	*cmd;
 	cmdalias_t		*a;
diff --git a/include/quakeasm.h b/include/asm.h
similarity index 100%
rename from include/quakeasm.h
rename to include/asm.h
diff --git a/include/sbar.h b/include/sbar.h
index 8d632e2..f664763 100644
--- a/include/sbar.h
+++ b/include/sbar.h
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // does, the entire thing will be redrawn for the next vid.numpages frames.
 #define	SBAR_HEIGHT		24
 
-extern	int			sb_lines;			// scan lines to draw
 extern	int			sb_what_lines;			// leilei - SCALED scan lines to draw
 
 void Sbar_Init (void);