diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 2c73d6e0b..67b4c0bf6 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -3330,7 +3330,7 @@ void CL_LinkPacketEntities (void)
 				CL_NewDlight(state->number, ent->origin, radius, 0.1, colour[0], colour[1], colour[2]);
 			}
 		}
-		if (state->lightpflags & PFLAGS_FULLDYNAMIC)
+		if (state->lightpflags & (PFLAGS_FULLDYNAMIC|PFLAGS_CORONA))
 		{
 			vec3_t colour;
 			if (!state->light[0] && !state->light[1] && !state->light[2])
@@ -3344,6 +3344,12 @@ void CL_LinkPacketEntities (void)
 				colour[2] = state->light[2]/1024.0f;
 			}
 			dl = CL_NewDlight(state->number, ent->origin, state->light[3]?state->light[3]:350, 0.1, colour[0], colour[1], colour[2]);
+			if (!(dl->flags & PFLAGS_FULLDYNAMIC))	//corona-only lights shouldn't do much else.
+			{
+				dl->flags &= ~(LFLAG_LIGHTMAP|LFLAG_FLASHBLEND);
+				/*make sure there's no rtlight*/
+				memset(dl->lightcolourscales, 0, sizeof(dl->lightcolourscales));
+			}
 			dl->corona = (state->lightpflags & PFLAGS_CORONA)?1:0;
 			dl->coronascale = 0.25;
 			dl->style = state->lightstyle;
diff --git a/engine/client/keys.c b/engine/client/keys.c
index 461e29e35..deda22340 100644
--- a/engine/client/keys.c
+++ b/engine/client/keys.c
@@ -781,7 +781,7 @@ void Key_DefaultLinkClicked(char *text, char *info)
 void Key_ConsoleRelease(console_t *con, int key, int unicode)
 {
 	char *buffer;
-	if (key == K_MOUSE1)
+	if (key == K_MOUSE1 && con->mousedown[2] == 1)
 	{
 		con->mousedown[2] = 0;
 		if (abs(con->mousedown[0] - con->mousecursor[0]) < 5 && abs(con->mousedown[1] - con->mousecursor[1]) < 5)
diff --git a/engine/client/m_items.c b/engine/client/m_items.c
index b7396068e..00fcbf113 100644
--- a/engine/client/m_items.c
+++ b/engine/client/m_items.c
@@ -144,7 +144,10 @@ void Draw_BigFontString(int x, int y, const char *text)
 	mpic_t *p;
 	p = QBigFontWorks();
 	if (!p)
+	{
+		Draw_FunString(x, y, text);
 		return;
+	}
 
 	{	//a hack for scaling
 		p->width = 20*8;
diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index d385a88c3..dffc109f2 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -5775,7 +5775,7 @@ qboolean CSQC_DrawView(void)
 	if (csqcg.frametime)
 		*csqcg.frametime = host_frametime;
 
-	if (csqc_isdarkplaces)
+	if (csqc_isdarkplaces && *csqcg.physics_mode == 1)
 	{
 		csqc_world.physicstime = cl.servertime;
 	}
diff --git a/engine/client/renderer.c b/engine/client/renderer.c
index 312e4897d..bee3f1c21 100644
--- a/engine/client/renderer.c
+++ b/engine/client/renderer.c
@@ -150,7 +150,7 @@ cvar_t r_waterwarp							= CVARF ("r_waterwarp", "1",
 cvar_t r_replacemodels						= CVARFD ("r_replacemodels", IFMINIMAL("","md3 md2"),
 												CVAR_ARCHIVE, "A list of filename extensions to attempt to use instead of mdl.");
 
-cvar_t gl_lightmap_nearest					= CVARFD ("gl_lightmap_nearest", "0", CVAR_ARCHIVE, "Use nearest sampling for lightmaps. This will give a more blocky look. Meaningless when gl_lightmap_nearest is enabled.");
+cvar_t gl_lightmap_nearest					= CVARFD ("gl_lightmap_nearest", "0", CVAR_ARCHIVE, "Use nearest sampling for lightmaps. This will give a more blocky look. Meaningless when gl_lightmap_average is enabled.");
 cvar_t gl_lightmap_average					= CVARFD ("gl_lightmap_average", "0", CVAR_ARCHIVE, "Determine lightmap values based upon the center of the polygon. This will give a more buggy look, quite probably.");
 
 //otherwise it would defeat the point.
diff --git a/engine/common/fs.c b/engine/common/fs.c
index 112bfa1e4..145d1b04c 100644
--- a/engine/common/fs.c
+++ b/engine/common/fs.c
@@ -1990,8 +1990,11 @@ void COM_FlushFSCache(void)
 		}
 	}
 
-	//rebuild it if needed
-	FS_RebuildFSHash();
+	if (com_fs_cache.ival)
+	{
+		//rebuild it if needed
+		FS_RebuildFSHash();
+	}
 }
 
 /*since should start as 0, otherwise this can be used to poll*/
diff --git a/engine/qclib/execloop.h b/engine/qclib/execloop.h
index 9da0b53fa..de0fceb12 100644
--- a/engine/qclib/execloop.h
+++ b/engine/qclib/execloop.h
@@ -661,6 +661,8 @@ reeval:
 				//break/skip the instruction.
 				PR_StackTrace(&progfuncs->funcs);
 				printf(msg, PR_StringToNative(&progfuncs->funcs, pr_xfunction->s_name));
+
+				glob = pr_globals;
 #ifndef DEBUGABLE
 				progfuncs->funcs.pr_trace++;
 				st--;
@@ -695,6 +697,7 @@ reeval:
 					{
 						st=&pr_statements[prinst.continuestatement];
 						prinst.continuestatement=-1;
+						glob = pr_globals;
 						break;
 					}
 				}
diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c
index 35a946c5a..e0cc6e85d 100644
--- a/engine/server/pr_cmds.c
+++ b/engine/server/pr_cmds.c
@@ -9207,8 +9207,8 @@ BuiltinList_t BuiltinList[] = {				//nq	qw		h2		ebfs
 	{"strpad",			PF_strpad,			0,		0,		0,		225,	D("string(float pad, string str1, ...)", "Pads the string with spaces, to ensure its a specific length (so long as a fixed-width font is used, anyway). If pad is negative, the spaces are added on the left. If positive the padding is on the right.")},	//will be moved
 	{"infoadd",			PF_infoadd,			0,		0,		0,		226,	D("string(string old, string key, string value)", "Returns a new tempstring infostring with the named value changed (or added if it was previously unspecified). Key and value may not contain the \\ character.")},
 	{"infoget",			PF_infoget,			0,		0,		0,		227,	D("string(string info, string key)", "Reads a named value from an infostring. The returned value is a tempstring")},
-	{"strcmp",			PF_strncmp,			0,		0,		0,		228,	D("float(string s1, string s2)", "Compares the two strings exactly. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.\nReturns 0 if the two strings are equal, a negative value if s1 appears numerically lower, and positive if s1 appears numerically higher.")},
-	{"strncmp",			PF_strncmp,			0,		0,		0,		228,	D("float(string s1, string s2, float len, optional float s1ofs, optional float s2ofs)", "Compares up to 'len' chars in the two strings. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.\nReturns 0 if the two strings are equal, a negative value if s1 appears numerically lower, and positive if s1 appears numerically higher.")},
+//	{"strcmp",			PF_strncmp,			0,		0,		0,		228,	D("float(string s1, string s2)", "Compares the two strings exactly. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.\nReturns 0 if the two strings are equal, a negative value if s1 appears numerically lower, and positive if s1 appears numerically higher.")},
+	{"strncmp",			PF_strncmp,			0,		0,		0,		228,	D("#define strcmp strncmp\nfloat(string s1, string s2, optional float len, optional float s1ofs, optional float s2ofs)", "Compares up to 'len' chars in the two strings. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.\nReturns 0 if the two strings are equal, a negative value if s1 appears numerically lower, and positive if s1 appears numerically higher.")},
 	{"strcasecmp",		PF_strncasecmp,		0,		0,		0,		229,	D("float(string s1, string s2)",  "Compares the two strings without case sensitivity.\nReturns 0 if they are equal. The sign of the return value may be significant, but should not be depended upon.")},
 	{"strncasecmp",		PF_strncasecmp,		0,		0,		0,		230,	D("float(string s1, string s2, float len, optional float s1ofs, optional float s2ofs)", "Compares up to 'len' chars in the two strings without case sensitivity. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.\nReturns 0 if they are equal. The sign of the return value may be significant, but should not be depended upon.")},
 //END FTE_STRINGS