diff --git a/mge/functions.nut b/mge/functions.nut
index 23cadcb..2cde7c4 100644
--- a/mge/functions.nut
+++ b/mge/functions.nut
@@ -1459,21 +1459,25 @@
 	{
 		local end = arena.SpawnPoints.len() - 1
 
+		//if koth_cap is not set in the mge config, KOTH uses the last index for the cap zone
 		if (arena.IsKoth && !("koth_cap" in arena) && !arena.IsCustomRuleset)
 			end--
 
 		local idx = arena.SpawnIdx
 
 		local team = player.GetTeam()
+		//halve the end point for red (first half of the spawn points)
 		if (team == TF_TEAM_RED)
 			end /= 2
 
+		//add half the current index for blue (second half of the spawn points)
 		if (team == TF_TEAM_BLUE)
 			idx += (end / 2)
 
 		idx = (idx + 1) % end
 		arena.SpawnIdx = idx
 
+		printl(Convars.GetClientConvarValue("name", player.entindex()) + " :\n " + player.GetTeam() + " :\n " + idx)
 		return idx
 	}
 
diff --git a/mge/mge.nut b/mge/mge.nut
index 2641fa3..2a7dc3d 100644
--- a/mge/mge.nut
+++ b/mge/mge.nut
@@ -741,6 +741,7 @@ timer_scope.InputSetTime <- function() {
 
 }
 timer_scope.Inputsettime <- timer_scope.InputSetTime
+timer_scope.hinted <- false
 
 timer_scope.TimerThink <- function()
 {
@@ -794,7 +795,6 @@ timer_scope.TimerThink <- function()
 			}
 		}
 
-		local hinted = false
 		// Show countdown message in last minute
 		if (time_left < 60 && !(time_left.tointeger() % 10))
 		{
@@ -802,9 +802,8 @@ timer_scope.TimerThink <- function()
 			{
 				SendGlobalGameEvent("player_hintmessage", {hintmessage = format("MAP RESTART IN %d SECONDS", time_left.tointeger())})
 				hinted = true
+				EntFireByHandle(self, "RunScriptCode", "self.GetScriptScope().hinted = false", 1.1, null, null)
 			}
-		} else {
-			hinted = false
 		}