diff --git a/src/gs-entbase/baseentity.h b/src/gs-entbase/baseentity.h
index 3d029a05..13667995 100644
--- a/src/gs-entbase/baseentity.h
+++ b/src/gs-entbase/baseentity.h
@@ -60,6 +60,7 @@ enumflags
 	BASEFL_CHANGED_ANGLES,
 	BASEFL_CHANGED_MODELINDEX,
 	BASEFL_CHANGED_SIZE,
+	BASEFL_CHANGED_FLAGS,
 	BASEFL_CHANGED_SOLID,
 	BASEFL_CHANGED_FRAME,
 	BASEFL_CHANGED_SKIN,
diff --git a/src/gs-entbase/client/env_cubemap.qc b/src/gs-entbase/client/env_cubemap.qc
index 1fc46536..36adc22f 100644
--- a/src/gs-entbase/client/env_cubemap.qc
+++ b/src/gs-entbase/client/env_cubemap.qc
@@ -93,7 +93,7 @@ CMap_Shoot(void)
 		setproperty(VF_ANGLES, [0,0,0]);
 
 		strReflectcube = sprintf(
-					"env/%s_%d_%d_%d",
+					"env/%s_%d_%d_%d.ktx",
 					mapname,
 					g_vecCubePos[0],
 					g_vecCubePos[1],
@@ -103,7 +103,7 @@ CMap_Shoot(void)
 			strReflectcube,
 			tmp.m_iSize));
 		self.think = CMap_Check;
-		self.nextthink = time + 0.5f;
+		self.nextthink = time + 0.25f;
 	} else {
 		print("^2Cubemaps done...\n");
 		localcmd("vid_reload\n");
@@ -124,7 +124,7 @@ CMap_Check(void)
 {
 	self.owner = find(self.owner, classname, "env_cubemap");
 	self.think = CMap_Shoot;
-	self.nextthink = time + 0.25f; /* because sigh */
+	self.nextthink = time + 0.1f; /* because sigh */
 }
 
 /*
diff --git a/src/gs-entbase/server/func_button.qc b/src/gs-entbase/server/func_button.qc
index 5c8cf2f1..71978ff8 100644
--- a/src/gs-entbase/server/func_button.qc
+++ b/src/gs-entbase/server/func_button.qc
@@ -304,6 +304,10 @@ func_button::Trigger(entity act, int state)
 
 	UseOutput(act, m_strOnPressed);
 	UseTargets(act, TRIG_TOGGLE, m_flDelay);
+
+	if (message)
+		env_message_single(act, message);
+
 	health = GetSpawnHealth();
 }
 
@@ -436,6 +440,9 @@ void
 func_button::SpawnKey(string strKey, string strValue)
 {
 	switch (strKey) {
+	case "message":
+		message = strValue;
+		break;
 	case "speed":
 		m_flSpeed = stof(strValue);
 		break;
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index ed5906e7..995c6ac3 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -381,7 +381,7 @@ CGameRules::IntermissionEnd(void)
 	if (!(input_buttons & INPUT_BUTTON0) && !(input_buttons & INPUT_BUTTON2))
 		return;
 
-	localcmd("restart\n");
+	localcmd("nextmap\n");
 }
 
 void
@@ -403,4 +403,4 @@ bool
 CGameRules::PlayerCanAttack(base_player bp)
 {
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/server/mapcycle.qc b/src/server/mapcycle.qc
index d4b3277e..7ba7d6d0 100644
--- a/src/server/mapcycle.qc
+++ b/src/server/mapcycle.qc
@@ -43,8 +43,11 @@ Mapcycle_Init(void)
 
 	/* read the lines in, see if the map exists and define an enumerated alias */
 	while ((temp = fgets(fs_mapcycle))) {
+#if 0
+		print(sprintf( "checking for map %s whichpack result: %S\n", strcat("maps/", temp, ".bsp"), whichpack(strcat("maps/", temp, ".bsp"))));
 		if (!whichpack(strcat("maps/", temp, ".bsp")))
-			break;
+			continue;
+#endif
 		readcmd(sprintf("alias m%i \"map %s;alias nextmap m%i\"\n", mapcount, temp, mapcount + 1i));
 
 		if (mapname == lastmap)