diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c
index 66425df11..33c0675e1 100644
--- a/engine/client/cl_demo.c
+++ b/engine/client/cl_demo.c
@@ -152,6 +152,7 @@ qboolean CL_GetDemoMessage (void)
 	float	demotime;
 	qbyte	c, msecsadded;
 	usercmd_t *pcmd;
+	q1usercmd_t q1cmd;
 
 	static float prevtime = 0;
 
@@ -308,7 +309,7 @@ readnext:
 		// user sent input
 		i = cls.netchan.outgoing_sequence & UPDATE_MASK;
 		pcmd = &cl.frames[i].cmd[0];
-		r = fread (pcmd, sizeof(*pcmd), 1, cls.demofile);
+		r = fread (&q1cmd, sizeof(q1cmd), 1, cls.demofile);
 		if (r != 1)
 		{
 			CL_StopPlayback ();
@@ -316,10 +317,17 @@ readnext:
 		}
 		// byte order stuff
 		for (j = 0; j < 3; j++)
-			pcmd->angles[j] = LittleFloat(pcmd->angles[j]);
-		pcmd->forwardmove = LittleShort(pcmd->forwardmove);
-		pcmd->sidemove    = LittleShort(pcmd->sidemove);
-		pcmd->upmove      = LittleShort(pcmd->upmove);
+		{
+			q1cmd.angles[j] = LittleFloat(q1cmd.angles[j]);
+			pcmd->angles[j] = ((int)(q1cmd.angles[j]*65536.0/360)&65535);
+		}
+		pcmd->forwardmove = q1cmd.forwardmove	= LittleShort(q1cmd.forwardmove);
+		pcmd->sidemove = q1cmd.sidemove			= LittleShort(q1cmd.sidemove);
+		pcmd->upmove = q1cmd.upmove				= LittleShort(q1cmd.upmove);
+		pcmd->msec = q1cmd.msec;
+		pcmd->buttons = q1cmd.buttons;
+
+
 		cl.frames[i].senttime = demotime;
 		cl.frames[i].receivedtime = -1;		// we haven't gotten a reply yet
 		cls.netchan.outgoing_sequence++;
diff --git a/engine/client/renderer.c b/engine/client/renderer.c
index 4c4417a97..a68c7a831 100644
--- a/engine/client/renderer.c
+++ b/engine/client/renderer.c
@@ -78,6 +78,8 @@ cvar_t	d_smooth = {"d_smooth", "0"};
 #endif
 cvar_t	gl_skyboxdist = {"gl_skyboxdist", "2300"};
 
+cvar_t	r_vertexdlights = {"r_vertexdlights", "1"};
+
 extern	cvar_t	r_dodgytgafiles;
 
 cvar_t	r_nolerp = {"r_nolerp", "0"};
@@ -154,6 +156,8 @@ cvar_t		gl_ati_truform = {"gl_ati_truform", "0"};
 cvar_t		gl_ati_truform_type = {"gl_ati_truform_type", "1"};
 cvar_t		gl_ati_truform_tesselation = {"gl_ati_truform_tesselation", "3"};
 
+cvar_t		gl_lateswap = {"gl_lateswap", "1"};
+
 cvar_t			scr_sshot_type = {"scr_sshot_type", "jpg"};
 
 
@@ -259,6 +263,7 @@ void GLRenderer_Init(void)
 	Cvar_Register (&gl_playermip, GLRENDEREROPTIONS);
 	Cvar_Register (&gl_nocolors, GLRENDEREROPTIONS);
 	Cvar_Register (&gl_finish, GLRENDEREROPTIONS);
+	Cvar_Register (&gl_lateswap, GLRENDEREROPTIONS);
 
 	Cvar_Register (&r_shadows, GLRENDEREROPTIONS);
 	Cvar_Register (&r_noaliasshadows, GLRENDEREROPTIONS);
diff --git a/engine/common/protocol.h b/engine/common/protocol.h
index 35ba92a12..12add2b19 100644
--- a/engine/common/protocol.h
+++ b/engine/common/protocol.h
@@ -706,6 +706,15 @@ typedef struct usercmd_s
 	qbyte	impulse;
 	qbyte lightlevel;
 } usercmd_t;
+
+typedef struct q1usercmd_s
+{
+	qbyte	msec;
+	vec3_t	angles;
+	short	forwardmove, sidemove, upmove;
+	qbyte	buttons;
+	qbyte	impulse;
+} q1usercmd_t;
 #define SHORT2ANGLE(x) (x) * (360.0/65536)
 
 
diff --git a/engine/ftequake/ftequake.dsp b/engine/ftequake/ftequake.dsp
index 10cc6a373..39707853a 100644
--- a/engine/ftequake/ftequake.dsp
+++ b/engine/ftequake/ftequake.dsp
@@ -28,6 +28,7 @@ CFG=ftequake - Win32 Q3Debug
 !MESSAGE "ftequake - Win32 Debug Dedicated Server" (based on "Win32 (x86) Application")
 !MESSAGE "ftequake - Win32 Release Dedicated Server" (based on "Win32 (x86) Application")
 !MESSAGE "ftequake - Win32 Q3Debug" (based on "Win32 (x86) Application")
+!MESSAGE "ftequake - Win32 Q3Release" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -189,7 +190,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\client\gltod3d\sdk7\include" /I "..\client\gltod3d\D3DFrame" /I "..\dxsdk\sdk\inc" /I "..\scitech\include" /I "..\client" /D "NOSOUNDASM" /D "NDEBUG" /D "_MBCS" /D "GLQUAKE" /D "SERVERDLL" /D "NQPROT" /D "WIN32" /D "_WINDOWS" /FR /YX /FD /c
-# ADD CPP /nologo /G6 /GX /O2 /I "..\client" /I "../libs/dxsdk7/include" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "GLQUAKE" /D "SWQUAKE" /D "AVAIL_DX7" /D "ZQUAKETEAMPLAY" /Fr /YX /FD /c
+# ADD CPP /nologo /G6 /GX /O2 /I "..\client" /I "../libs/dxsdk7/include" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "GLQUAKE" /D "SWQUAKE" /D "AVAIL_DX7" /Fr /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -301,7 +302,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G5 /ML /W3 /GX /ZI /Od /I "..\client" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /D "MINIMAL" /D "_DEBUG" /D "GLQUAKE" /D "WIN32" /D "_WINDOWS" /D "SERVERONLY" /FR".\GLDebug/" /Fp".\GLDebug/qwcl.pch" /YX /Fo".\GLDebug/" /Fd".\GLDebug/" /FD /c
-# ADD CPP /nologo /G6 /ML /W3 /GX /O1 /I "..\client" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /I "../libs/dxsdk7/include" /D "MINIMAL" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SERVERONLY" /FR".\GLDebug/" /Fp".\GLDebug/qwcl.pch" /YX /Fo".\GLDebug/" /Fd".\GLDebug/" /FD /c
+# ADD CPP /nologo /G6 /ML /W3 /GX /O1 /I "..\client" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /I "../libs/dxsdk7/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SERVERONLY" /FR".\GLDebug/" /Fp".\GLDebug/qwcl.pch" /YX /Fo".\GLDebug/" /Fd".\GLDebug/" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -312,7 +313,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /pdb:".\GLDebug/dglqwcl.pdb" /debug /machine:I386 /out:"../../../fteminglqw.exe"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 winmm.lib wsock32.lib user32.lib shell32.lib /nologo /subsystem:console /incremental:no /pdb:".\GLDebug/dglqwcl.pdb" /map /machine:I386 /out:"../../fteqwsv.exe"
+# ADD LINK32 winmm.lib wsock32.lib user32.lib shell32.lib Advapi32.lib /nologo /subsystem:console /incremental:no /pdb:".\GLDebug/dglqwcl.pdb" /map /machine:I386 /out:"../../fteqwsv.exe"
 # SUBTRACT LINK32 /pdb:none /debug
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
@@ -346,6 +347,33 @@ LINK32=link.exe
 # ADD LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /pdb:".\GLDebug/dglqwcl.pdb" /debug /machine:I386 /out:"../../fteglqw.exe"
 # SUBTRACT LINK32 /pdb:none
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ftequake___Win32_Q3Release0"
+# PROP BASE Intermediate_Dir "ftequake___Win32_Q3Release0"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ftequake___Win32_Q3Release0"
+# PROP Intermediate_Dir "ftequake___Win32_Q3Release0"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /Gr /W3 /GX /O2 /Ob2 /I "..\client" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /I "../libs/dxsdk7/include" /D "NDEBUG" /D "_MBCS" /D "GLQUAKE" /D "WIN32" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /G6 /Gr /W3 /GX /O2 /Ob2 /I "..\client" /I "../common" /I "../server" /I "../gl" /I "../sw" /I "../qclib" /I "../libs" /I "../libs/dxsdk7/include" /D "NDEBUG" /D "_MBCS" /D "GLQUAKE" /D "WIN32" /D "_WINDOWS" /D "Q3SHADERS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /map /machine:I386 /out:"../../fteglqw.exe"
+# ADD LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /map /machine:I386 /out:"../../fteglqw.exe"
+
 !ENDIF 
 
 # Begin Target
@@ -361,6 +389,7 @@ LINK32=link.exe
 # Name "ftequake - Win32 Debug Dedicated Server"
 # Name "ftequake - Win32 Release Dedicated Server"
 # Name "ftequake - Win32 Q3Debug"
+# Name "ftequake - Win32 Q3Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -482,6 +511,8 @@ SOURCE=..\client\cd_win.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -516,6 +547,8 @@ SOURCE=..\client\cl_cam.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -550,6 +583,8 @@ SOURCE=..\client\cl_demo.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -584,6 +619,8 @@ SOURCE=..\client\cl_ents.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -618,6 +655,8 @@ SOURCE=..\client\cl_input.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -652,6 +691,8 @@ SOURCE=..\client\cl_main.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -686,6 +727,8 @@ SOURCE=..\client\cl_parse.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -720,6 +763,8 @@ SOURCE=..\client\cl_pred.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -754,6 +799,8 @@ SOURCE=..\client\cl_screen.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -788,6 +835,8 @@ SOURCE=..\client\cl_tent.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -822,6 +871,8 @@ SOURCE=..\client\cl_ui.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -856,6 +907,8 @@ SOURCE=..\client\clq2_cin.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -890,6 +943,8 @@ SOURCE=..\client\clq2_ents.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -924,6 +979,8 @@ SOURCE=..\client\console.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -958,6 +1015,8 @@ SOURCE=..\client\fragstats.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -992,6 +1051,8 @@ SOURCE=..\client\image.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1026,6 +1087,8 @@ SOURCE=..\client\in_win.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1060,6 +1123,8 @@ SOURCE=..\client\keys.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1094,6 +1159,8 @@ SOURCE=..\client\m_items.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1128,6 +1195,8 @@ SOURCE=..\client\m_master.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1162,6 +1231,8 @@ SOURCE=..\client\m_mp3.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1196,6 +1267,8 @@ SOURCE=..\client\m_multi.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1230,6 +1303,8 @@ SOURCE=..\client\m_options.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1264,6 +1339,8 @@ SOURCE=..\client\m_script.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1298,6 +1375,8 @@ SOURCE=..\client\m_single.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1332,6 +1411,8 @@ SOURCE=..\client\menu.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1366,6 +1447,8 @@ SOURCE=..\client\net_master.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1400,6 +1483,8 @@ SOURCE=..\client\r_bulleten.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1435,6 +1520,8 @@ SOURCE=..\client\r_efrag.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1469,6 +1556,8 @@ SOURCE=..\client\r_part.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1503,6 +1592,8 @@ SOURCE=..\client\r_partset.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1537,6 +1628,8 @@ SOURCE=..\client\renderer.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1571,6 +1664,8 @@ SOURCE=..\client\renderque.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1605,6 +1700,8 @@ SOURCE=..\client\roq_read.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1639,6 +1736,8 @@ SOURCE=..\client\sbar.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1673,6 +1772,8 @@ SOURCE=..\client\skin.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1707,6 +1808,8 @@ SOURCE=..\client\snd_dma.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1741,6 +1844,8 @@ SOURCE=..\client\snd_mem.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1775,6 +1880,8 @@ SOURCE=..\client\snd_mix.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1809,6 +1916,8 @@ SOURCE=..\client\snd_mp3.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1843,6 +1952,8 @@ SOURCE=..\client\snd_ov.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1877,6 +1988,8 @@ SOURCE=..\client\snd_win.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1911,6 +2024,8 @@ SOURCE=..\client\sys_win.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1945,6 +2060,8 @@ SOURCE=..\client\teamplay.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -1979,6 +2096,8 @@ SOURCE=..\client\textedit.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2013,6 +2132,8 @@ SOURCE=..\client\valid.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2047,6 +2168,8 @@ SOURCE=..\client\view.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2081,6 +2204,8 @@ SOURCE=..\client\wad.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2115,6 +2240,8 @@ SOURCE=..\client\zqtp.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2155,6 +2282,8 @@ SOURCE=..\gl\gl_alias.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2191,6 +2320,8 @@ SOURCE=..\gl\gl_backend.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2227,6 +2358,8 @@ SOURCE=..\gl\gl_draw.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2263,6 +2396,8 @@ SOURCE=..\gl\gltod3d\gl_fakegl.cpp
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2299,6 +2434,8 @@ SOURCE=..\gl\gl_hlmdl.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2335,6 +2472,8 @@ SOURCE=..\gl\gl_model.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2371,6 +2510,8 @@ SOURCE=..\gl\gl_ngraph.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2407,6 +2548,8 @@ SOURCE=..\gl\gl_ppl.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2437,10 +2580,11 @@ SOURCE=..\common\gl_q2bsp.c
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Release Dedicated Server"
 
 # PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2477,6 +2621,8 @@ SOURCE=..\gl\gl_rlight.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2513,6 +2659,8 @@ SOURCE=..\gl\gl_rmain.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2549,6 +2697,8 @@ SOURCE=..\gl\gl_rmisc.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2585,6 +2735,8 @@ SOURCE=..\gl\gl_rsurf.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2621,6 +2773,8 @@ SOURCE=..\gl\gl_screen.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2630,46 +2784,30 @@ SOURCE=..\gl\gl_shader.c
 
 !IF  "$(CFG)" == "ftequake - Win32 Release"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Debug"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 GLDebug"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 GLRelease"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 MDebug"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 MRelease"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 MinGLDebug"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 MinGLRelease"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Debug Dedicated Server"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Release Dedicated Server"
 
 # PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2706,6 +2844,8 @@ SOURCE=..\gl\gl_vidcommon.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2742,6 +2882,8 @@ SOURCE=..\gl\gl_vidnt.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2778,6 +2920,8 @@ SOURCE=..\gl\gl_warp.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2814,6 +2958,8 @@ SOURCE=..\gl\glmod_doom.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2850,6 +2996,8 @@ SOURCE=..\gl\LTFACE.C
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -2903,6 +3051,11 @@ SOURCE=..\sw\d_edge.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -2948,6 +3101,11 @@ SOURCE=..\sw\d_fill.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -2993,6 +3151,11 @@ SOURCE=..\sw\d_init.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3038,6 +3201,11 @@ SOURCE=..\sw\d_modech.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3083,6 +3251,11 @@ SOURCE=..\sw\d_part.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3128,6 +3301,11 @@ SOURCE=..\sw\d_polyse.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3173,6 +3351,11 @@ SOURCE=..\sw\d_scan.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3218,6 +3401,11 @@ SOURCE=..\sw\d_sky.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3263,6 +3451,11 @@ SOURCE=..\sw\d_sprite.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3308,6 +3501,11 @@ SOURCE=..\sw\d_surf.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3353,6 +3551,11 @@ SOURCE=..\sw\d_trans.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3398,6 +3601,11 @@ SOURCE=..\sw\d_vars.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3443,6 +3651,11 @@ SOURCE=..\sw\d_zpoint.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3488,6 +3701,11 @@ SOURCE=..\sw\nonintel.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3533,6 +3751,11 @@ SOURCE=..\sw\r_aclip.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3578,6 +3801,11 @@ SOURCE=..\sw\r_alias.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3623,6 +3851,11 @@ SOURCE=..\sw\r_bsp.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3668,6 +3901,11 @@ SOURCE=..\sw\r_draw.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3713,6 +3951,11 @@ SOURCE=..\sw\r_edge.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3758,6 +4001,11 @@ SOURCE=..\sw\r_light.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3803,6 +4051,11 @@ SOURCE=..\sw\r_main.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3848,6 +4101,11 @@ SOURCE=..\sw\r_misc.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3893,6 +4151,11 @@ SOURCE=..\sw\r_sky.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3938,6 +4201,11 @@ SOURCE=..\sw\r_sprite.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -3983,6 +4251,11 @@ SOURCE=..\sw\r_surf.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4028,6 +4301,11 @@ SOURCE=..\sw\r_vars.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4073,6 +4351,11 @@ SOURCE=..\sw\sw_draw.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4118,6 +4401,11 @@ SOURCE=..\sw\sw_model.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4163,6 +4451,11 @@ SOURCE=..\sw\sw_screen.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4208,6 +4501,11 @@ SOURCE=..\sw\vid_ddraw.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4253,6 +4551,11 @@ SOURCE=..\sw\vid_dib.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4298,6 +4601,11 @@ SOURCE=..\sw\vid_win2.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4573,6 +4881,11 @@ InputName=d_draw
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4676,6 +4989,11 @@ InputName=d_draw16
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4779,6 +5097,11 @@ InputName=d_parta
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4882,6 +5205,11 @@ InputName=d_polysa
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -4985,6 +5313,11 @@ InputName=d_scana
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5088,6 +5421,11 @@ InputName=d_spr8
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5191,6 +5529,11 @@ InputName=d_varsa
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5364,6 +5707,21 @@ InputName=math
 	
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# Begin Custom Build
+OutDir=.\ftequake___Win32_Q3Release0
+InputPath=..\common\math.s
+InputName=math
+
+"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cl /EP  /DSWQUAKE /I ..\common > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	..\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >          $(OUTDIR)\$(InputName).asm 
+	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                                           $(OUTDIR)\$(InputName).asm 
+	del $(OUTDIR)\$(InputName).spp 
+	
+# End Custom Build
+
 !ENDIF 
 
 # End Source File
@@ -5467,6 +5825,11 @@ InputName=r_aclipa
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5570,6 +5933,11 @@ InputName=r_aliasa
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5673,6 +6041,11 @@ InputName=r_drawa
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5776,6 +6149,11 @@ InputName=r_edgea
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -5879,6 +6257,11 @@ InputName=r_varsa
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -6031,6 +6414,21 @@ InputName=snd_mixa
 	
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# Begin Custom Build
+OutDir=.\ftequake___Win32_Q3Release0
+InputPath=..\client\snd_mixa.s
+InputName=snd_mixa
+
+"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cl /EP  /DSWQUAKE /I ..\common > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	..\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >          $(OUTDIR)\$(InputName).asm 
+	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                                           $(OUTDIR)\$(InputName).asm 
+	del $(OUTDIR)\$(InputName).spp 
+	
+# End Custom Build
+
 !ENDIF 
 
 # End Source File
@@ -6134,6 +6532,11 @@ InputName=surf16
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -6237,6 +6640,11 @@ InputName=surf8
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -6389,6 +6797,21 @@ InputName=sys_wina
 	
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# Begin Custom Build
+OutDir=.\ftequake___Win32_Q3Release0
+InputPath=..\client\sys_wina.s
+InputName=sys_wina
+
+"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cl /EP  /DSWQUAKE /I ..\common > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	..\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >          $(OUTDIR)\$(InputName).asm 
+	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                                           $(OUTDIR)\$(InputName).asm 
+	del $(OUTDIR)\$(InputName).spp 
+	
+# End Custom Build
+
 !ENDIF 
 
 # End Source File
@@ -6562,6 +6985,21 @@ InputName=worlda
 	
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# Begin Custom Build
+OutDir=.\ftequake___Win32_Q3Release0
+InputPath=..\server\worlda.s
+InputName=worlda
+
+"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cl /EP  /DSWQUAKE /I ..\common > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	..\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >          $(OUTDIR)\$(InputName).asm 
+	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                                           $(OUTDIR)\$(InputName).asm 
+	del $(OUTDIR)\$(InputName).spp 
+	
+# End Custom Build
+
 !ENDIF 
 
 # End Source File
@@ -6688,6 +7126,8 @@ SOURCE=..\qux\m_x.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6722,6 +7162,8 @@ SOURCE=..\qux\qux.h
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6756,6 +7198,8 @@ SOURCE=..\qux\X.h
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6790,6 +7234,8 @@ SOURCE=..\qux\x_reqs.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6826,6 +7272,8 @@ SOURCE=..\qux\x_res.c
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6860,6 +7308,8 @@ SOURCE=..\qux\Xmd.h
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6894,6 +7344,8 @@ SOURCE=..\qux\Xproto.h
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6928,6 +7380,8 @@ SOURCE=..\qux\Xprotostr.h
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -6980,6 +7434,11 @@ SOURCE=..\server\sv_sys_win.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7028,6 +7487,11 @@ SOURCE=..\server\svmodel.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7066,6 +7530,8 @@ SOURCE=..\client\winquake.rc
 
 !ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Debug"
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
 !ENDIF 
 
 # End Source File
@@ -7160,6 +7626,11 @@ SOURCE=..\..\mp3\libmad\bit.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7218,6 +7689,11 @@ SOURCE=..\..\mp3\libmad\decoder.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7276,6 +7752,11 @@ SOURCE=..\..\mp3\libmad\fixed.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7334,6 +7815,11 @@ SOURCE=..\..\mp3\libmad\frame.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7392,6 +7878,11 @@ SOURCE=..\..\mp3\libmad\huffman.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7450,6 +7941,11 @@ SOURCE=..\..\mp3\libmad\layer12.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7508,6 +8004,11 @@ SOURCE=..\..\mp3\libmad\layer3.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7566,6 +8067,11 @@ SOURCE=..\client\mymad.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7624,6 +8130,11 @@ SOURCE=..\..\mp3\libmad\stream.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7682,6 +8193,11 @@ SOURCE=..\..\mp3\libmad\synth.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7740,6 +8256,11 @@ SOURCE=..\..\mp3\libmad\timer.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -7798,6 +8319,11 @@ SOURCE=..\..\mp3\libmad\version.c
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "ftequake - Win32 Q3Release"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c
index a7c3eb51e..2686f018d 100644
--- a/engine/gl/gl_alias.c
+++ b/engine/gl/gl_alias.c
@@ -59,6 +59,7 @@ int numTempNormals;
 vec3_t *tempNormals;
 
 extern cvar_t gl_ati_truform;
+extern cvar_t r_vertexdlights;
 
 typedef struct {
 	int ofs_indexes;
@@ -840,8 +841,6 @@ void R_DrawGAliasModel (entity_t *e)
 	float entScale;
 	vec3_t lightdir;
 
-	int pervertexdlights = 1;
-
 	float	tmatrix[3][4];
 
 	currententity = e;
@@ -868,7 +867,7 @@ void R_DrawGAliasModel (entity_t *e)
 		lightdir[2] = 1;
 	}
 
-	if (!pervertexdlights)
+	if (!r_vertexdlights.value)
 	{
 		for (i=0 ; i<MAX_DLIGHTS ; i++)
 		{
@@ -1139,7 +1138,7 @@ void R_DrawGAliasModel (entity_t *e)
 	while(inf)
 	{
 		R_GAliasBuildMesh(&mesh, inf, e->frame, e->oldframe, e->lerptime, e->alpha);
-		if (pervertexdlights)
+		if (r_vertexdlights.value)
 			R_GAliasAddDlights(&mesh, e->origin, e->angles);
 		skin = GL_ChooseSkin(inf, clmodel->name, e);
 		c_alias_polys += mesh.numindexes/3;
diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c
index 97f26c04b..d47af54a0 100644
--- a/engine/gl/gl_backend.c
+++ b/engine/gl/gl_backend.c
@@ -81,7 +81,19 @@ void GL_FlushBinds(void)
 	}
 }
 
-
+typedef vec3_t mat3_t[3];
+void Matrix3_Multiply (mat3_t in1, mat3_t in2, mat3_t out)
+{
+	out[0][0] = in1[0][0]*in2[0][0] + in1[0][1]*in2[1][0] + in1[0][2]*in2[2][0];
+	out[0][1] = in1[0][0]*in2[0][1] + in1[0][1]*in2[1][1] + in1[0][2]*in2[2][1];
+	out[0][2] = in1[0][0]*in2[0][2] + in1[0][1]*in2[1][2] + in1[0][2]*in2[2][2];
+	out[1][0] = in1[1][0]*in2[0][0] + in1[1][1]*in2[1][0] +	in1[1][2]*in2[2][0];
+	out[1][1] = in1[1][0]*in2[0][1] + in1[1][1]*in2[1][1] + in1[1][2]*in2[2][1];
+	out[1][2] = in1[1][0]*in2[0][2] + in1[1][1]*in2[1][2] +	in1[1][2]*in2[2][2];
+	out[2][0] = in1[2][0]*in2[0][0] + in1[2][1]*in2[1][0] +	in1[2][2]*in2[2][0];
+	out[2][1] = in1[2][0]*in2[0][1] + in1[2][1]*in2[1][1] +	in1[2][2]*in2[2][1];
+	out[2][2] = in1[2][0]*in2[0][2] + in1[2][1]*in2[1][2] +	in1[2][2]*in2[2][2];
+}
 
 
 
@@ -802,7 +814,6 @@ void VectorNormalizeFast( vec3_t v )
 
 
 
-typedef vec3_t mat3_t[3];
 mat3_t axisDefault={{1, 0, 0},
 					{0, 1, 0},
 					{0, 0, 1}};
@@ -827,19 +838,6 @@ void Matrix3_Multiply_Vec3 (mat3_t a, vec3_t b, vec3_t product)
 	product[2] = a[2][0]*b[0] + a[2][1]*b[1] + a[2][2]*b[2];
 }
 
-void Matrix3_Multiply (mat3_t in1, mat3_t in2, mat3_t out)
-{
-	out[0][0] = in1[0][0]*in2[0][0] + in1[0][1]*in2[1][0] + in1[0][2]*in2[2][0];
-	out[0][1] = in1[0][0]*in2[0][1] + in1[0][1]*in2[1][1] + in1[0][2]*in2[2][1];
-	out[0][2] = in1[0][0]*in2[0][2] + in1[0][1]*in2[1][2] + in1[0][2]*in2[2][2];
-	out[1][0] = in1[1][0]*in2[0][0] + in1[1][1]*in2[1][0] +	in1[1][2]*in2[2][0];
-	out[1][1] = in1[1][0]*in2[0][1] + in1[1][1]*in2[1][1] + in1[1][2]*in2[2][1];
-	out[1][2] = in1[1][0]*in2[0][2] + in1[1][1]*in2[1][2] +	in1[1][2]*in2[2][2];
-	out[2][0] = in1[2][0]*in2[0][0] + in1[2][1]*in2[1][0] +	in1[2][2]*in2[2][0];
-	out[2][1] = in1[2][0]*in2[0][1] + in1[2][1]*in2[1][1] +	in1[2][2]*in2[2][1];
-	out[2][2] = in1[2][0]*in2[0][2] + in1[2][1]*in2[1][2] +	in1[2][2]*in2[2][2];
-}
-
 int Matrix3_Compare(mat3_t in, mat3_t out)
 {
 	return memcmp(in, out, sizeof(mat3_t));
diff --git a/engine/gl/gl_draw.c b/engine/gl/gl_draw.c
index 142681b43..4bb1290e8 100644
--- a/engine/gl/gl_draw.c
+++ b/engine/gl/gl_draw.c
@@ -807,6 +807,7 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n"));
 
 	TRACE(("dbg: GLDraw_ReInit: GL_EndRendering\n"));
 	GL_EndRendering ();	
+	GL_DoSwap();
 
 
 #ifdef Q3SHADERS
diff --git a/engine/gl/gl_ppl.c b/engine/gl/gl_ppl.c
index 4647842f6..2e897be71 100644
--- a/engine/gl/gl_ppl.c
+++ b/engine/gl/gl_ppl.c
@@ -1402,6 +1402,8 @@ void PPL_BaseTextures(model_t *model)
 	msurface_t	*s;
 	texture_t	*t;
 
+	GL_DoSwap();
+
 	glDisable(GL_BLEND);
 	glColor4f(1,1,1, 1);
 //	glDepthFunc(GL_LESS);
diff --git a/engine/gl/gl_rmisc.c b/engine/gl/gl_rmisc.c
index 0a02d5323..0a24e1b72 100644
--- a/engine/gl/gl_rmisc.c
+++ b/engine/gl/gl_rmisc.c
@@ -208,6 +208,7 @@ void R_Envmap_f (void)
 	glDrawBuffer  (GL_BACK);
 	glReadBuffer  (GL_BACK);
 	GL_EndRendering ();
+	GL_DoSwap();
 }
 
 
@@ -934,6 +935,7 @@ void GLR_TimeRefresh_f (void)
 
 	glDrawBuffer  (GL_BACK);
 	GL_EndRendering ();
+	GL_DoSwap();
 }
 
 #ifndef SWQUAKE
diff --git a/engine/gl/gl_screen.c b/engine/gl/gl_screen.c
index a60ca1a7b..0a5a59d11 100644
--- a/engine/gl/gl_screen.c
+++ b/engine/gl/gl_screen.c
@@ -117,6 +117,7 @@ void GLSCR_UpdateScreen (void)
 			GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
 			SCR_DrawLoading ();
 			GL_EndRendering ();	
+			GL_DoSwap();
 			return;
 		}
 	}
@@ -144,6 +145,7 @@ void GLSCR_UpdateScreen (void)
 #endif
 		GLR_BrightenScreen();
 		GL_EndRendering ();	
+		GL_DoSwap();
 		return;
 	}
 #endif
@@ -156,6 +158,7 @@ void GLSCR_UpdateScreen (void)
 #endif
 		GLR_BrightenScreen();
 		GL_EndRendering ();	
+		GL_DoSwap();
 		return;
 	}
 	
@@ -180,6 +183,8 @@ void GLSCR_UpdateScreen (void)
 	SCR_SetUpToDrawConsole ();
 	if (cl.worldmodel && uimenu != 1)
 		V_RenderView ();
+	else
+		GL_DoSwap();
 
 	GL_Set2D ();
 
@@ -252,7 +257,7 @@ void GLSCR_UpdateScreen (void)
 #if defined(_WIN32) && defined(RGLQUAKE)
 	Media_RecordFrame();
 #endif
-	GL_EndRendering ();	
+	GL_EndRendering ();
 }
 
 
diff --git a/engine/gl/gl_vidnt.c b/engine/gl/gl_vidnt.c
index 7cbb6a678..14662c2dc 100644
--- a/engine/gl/gl_vidnt.c
+++ b/engine/gl/gl_vidnt.c
@@ -158,6 +158,7 @@ extern cvar_t		_vid_wait_override;
 extern cvar_t		vid_stretch_by_2;
 extern cvar_t		_windowed_mouse;
 extern cvar_t		vid_hardwaregamma;
+extern cvar_t		gl_lateswap;
 
 int			window_center_x, window_center_y, window_x, window_y, window_width, window_height;
 RECT		window_rect;
@@ -802,8 +803,13 @@ void GL_BeginRendering (int *x, int *y, int *width, int *height)
 //	glViewport (*x, *y, *width, *height);
 }
 
-void GL_EndRendering (void)
+qboolean screenflush;
+void GL_DoSwap (void)
 {
+	if (!screenflush)
+		return;
+	screenflush = 0;
+
 	if (!scr_skipupdate || block_drawing)
 		qSwapBuffers(maindc);
 
@@ -835,6 +841,13 @@ void GL_EndRendering (void)
 	}
 }
 
+void GL_EndRendering (void)
+{
+	screenflush = true;
+	if (!gl_lateswap.value)
+		GL_DoSwap();
+}
+
 void	GLVID_SetPalette (unsigned char *palette)
 {
 	qbyte	*pal;
diff --git a/engine/gl/glmod_doom.c b/engine/gl/glmod_doom.c
index 2c6c94f2d..c6b0cb145 100644
--- a/engine/gl/glmod_doom.c
+++ b/engine/gl/glmod_doom.c
@@ -25,6 +25,8 @@ int	PlaneTypeForNormal ( vec3_t normal );
 //Matthew S Fell (msfell@aol.com)
 //Unofficial Doom Specs
 
+//(aol suck)
+
 void Doom_SetHullFuncs(hull_t *hull);
 void Doom_SetModelFunc(model_t *mod);
 
diff --git a/engine/qclib/qcc_pr_lex.c b/engine/qclib/qcc_pr_lex.c
index 19dd3455e..04607df40 100644
--- a/engine/qclib/qcc_pr_lex.c
+++ b/engine/qclib/qcc_pr_lex.c
@@ -42,7 +42,12 @@ int numCompilerConstants;
 
 char	*pr_punctuation[] =
 // longer symbols must be before a shorter partial match
-{"&&", "||", "<=", ">=","==", "!=", "/=", "*=", "+=", "-=", "(+)", "(-)", "++", "--", "::", ";", ",", "!", "*", "/", "(", ")", "-", "+", "=", "[", "]", "{", "}", "...", "..", ".", "<<", "<", ">>", ">" , "#" , "@", "&" , "|", "^", ":", NULL};
+{"&&", "||", "<=", ">=","==", "!=", "/=", "*=", "+=", "-=", "|=", "(+)", "(-)", "++", "--", "->", "::", ";", ",", "!", "*", "/", "(", ")", "-", "+", "=", "[", "]", "{", "}", "...", "..", ".", "<<", "<", ">>", ">" , "#" , "@", "&" , "|", "^", ":", NULL};
+
+char *pr_punctuationremap[] =	//a nice bit of evilness.
+//|= -> (+)
+//-> -> .
+{"&&", "||", "<=", ">=","==", "!=", "/=", "*=", "+=", "-=", "(+)","(+)", "(-)", "++", "--", ".", "::", ";", ",", "!", "*", "/", "(", ")", "-", "+", "=", "[", "]", "{", "}", "...", "..", ".", "<<", "<", ">>", ">" , "#" , "@", "&" , "|", "^", ":", NULL};
 
 // simple types.  function types are dynamically allocated
 QCC_type_t	*type_void;// = {ev_void/*, &def_void*/};
@@ -1299,7 +1304,7 @@ void QCC_PR_LexPunctuation (void)
 		len = strlen(p);
 		if (!strncmp(p, pr_file_p, len) )
 		{
-			strcpy (pr_token, p);
+			strcpy (pr_token, pr_punctuationremap[i]);
 			if (p[0] == '{')
 				pr_bracelevel++;
 			else if (p[0] == '}')
@@ -2117,7 +2122,7 @@ void QCC_PR_Lex (void)
 
 // if the first character is a valid identifier, parse until a non-id
 // character is reached
-	if ( c == '~' )
+	if ( c == '~' || c == '%')	//let's see which one we make into an operator first... possibly both...
 	{
 		pr_file_p++;
 		pr_token_type = tt_immediate;