diff --git a/source/cl_main.c b/source/cl_main.c
index 59a2df0..9c4b5e0 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -1586,8 +1586,8 @@ void Host_Init (quakeparms_t *parms)
 	Cmd_Exec_File (fs_globalcfg->string);
 	Cbuf_Execute_Sets ();
 
-	Cmd_StuffCmds_f ();
-	Cbuf_Execute_Sets ();
+	//Cmd_StuffCmds_f ();
+	//Cbuf_Execute_Sets ();
 
 	V_Init ();
 	SCR_InitCvars ();
diff --git a/source/cl_parse.c b/source/cl_parse.c
index 7e7910c..2733082 100644
--- a/source/cl_parse.c
+++ b/source/cl_parse.c
@@ -574,7 +574,6 @@ CL_ParseServerData
 void CL_ParseServerData (void)
 {
 	char	*str;
-	QFile	*f;
 	char	fn[MAX_OSPATH];
 	qboolean	cflag = false;
 	extern	char	gamedirfile[MAX_OSPATH];
@@ -611,25 +610,11 @@ void CL_ParseServerData (void)
 	//if it exists
 	if (cflag) {
 		int cl_warncmd_val = cl_warncmd->value;
-		snprintf(fn, sizeof(fn), "%s/%s", com_gamedir, "config.cfg");
-		if ((f = Qopen(fn, "r")) != NULL) {
-			Qclose(f);
-			Cbuf_AddText ("cl_warncmd 0\n");
-			Cbuf_AddText ("exec config.cfg\n");
-		}
-		snprintf(fn, sizeof(fn), "%s/%s", com_gamedir, "frontend.cfg");
-		if ((f = Qopen(fn, "r")) != NULL) {
-			Qclose(f);
-			Cbuf_AddText ("cl_warncmd 0\n");
-			Cbuf_AddText ("exec frontend.cfg\n");
-		}
+		Cbuf_AddText ("cl_warncmd 0\n");
+		Cbuf_AddText ("exec config.cfg\n");
+		Cbuf_AddText ("exec frontend.cfg\n");
 		if (cl_autoexec->value) {
-			snprintf(fn, sizeof(fn), "%s/%s", com_gamedir, "autoexec.cfg");
-			if ((f = Qopen(fn, "r")) != NULL) {
-				Qclose(f);
-				Cbuf_AddText ("cl_warncmd 0\n");
-				Cbuf_AddText ("exec autoexec.cfg\n");
-			}
+			Cbuf_AddText ("exec autoexec.cfg\n");
 		}
 		snprintf(fn,sizeof(fn), "cl_warncmd %d\n", cl_warncmd_val);
 		Cbuf_AddText(fn);
diff --git a/source/gl_rmain.c b/source/gl_rmain.c
index 932e218..530b5c8 100644
--- a/source/gl_rmain.c
+++ b/source/gl_rmain.c
@@ -548,7 +548,7 @@ static void R_DrawAliasModel (entity_t *e)
 
 	// allways give the gun some light
 	if (e == &cl.viewent)
-		shadelight = min(shadelight, 24);
+		shadelight = max(shadelight, 24);
 
 	for (lnum=0 ; lnum<MAX_DLIGHTS ; lnum++)
 	{
diff --git a/source/locs.c b/source/locs.c
index 5471c3c..66ec9f0 100644
--- a/source/locs.c
+++ b/source/locs.c
@@ -108,6 +108,7 @@ void locs_load(char *mapname)
 		t2[0] = '\0';
 		locs_add(loc, t1);
 	}
+	Qclose(file);
 }
 
 void locs_reset()