diff --git a/config/survival.cfg b/config/survival.cfg
index 9a97f30d..92d432de 100644
--- a/config/survival.cfg
+++ b/config/survival.cfg
@@ -23,14 +23,14 @@ resetSurvAliases
 
 survival = [
   storesets "positiontype" tmpSurvSets; add2list tmpSurvSets $survNumBots; curSurvDifficulty = 0; positiontype 1; resetSurvAliases
-  if (! (strstr $onKill survKills)) [ add2alias onKill [ += survKills 1 ] ]
+  if (|| (! (checkalias onKill)) (! (strstr $onKill survKills))) [ add2alias onKill [ += survKills 1 ] ]
   add2alias mapstartonce  [
     startPreSurvMillis = (millis)
     echo (c 2)Bot survival mode prepared, gather items and find the arena to start! (c 9)You have (c 5) (div $timeUntilTele 1000) (c 9)seconds to prepare!
     if (strstr $defaultmaps (curmap 1)) [ survMap = (findlist $defaultmaps (curmap 1)) ]
     setOfcZones; checkzone
   ]
-  if (! (curteam)) [ team RVSF ]; mode 7; map $arg1
+  if (! (curteam)) [ team RVSF ]; mode 7; map $arg1 // Make 'em fight for us :p
 ]
 
 startSurvival = [
@@ -109,7 +109,7 @@ checkzone = [
     if (&& (>= (- (millis) $lastCheckPoint) $timeBetChkPts) (&& $startedSurvival $gotCheckPoint)) [ increaseDifficulty ]
     if (&& (! $startedOBCount) (&& (! (isInZone)) $startedSurvival)) [ startOBCount ]
     if (&& $startedSurvival (&& (! (alive)) (>= (- (millis) $startSurvMillis) 500))) [ finalSurvMillis = (- (millis) $startSurvMillis); endSurvival (concatword (c 3) "You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.") ]
-    sleep 0 [ checkzone ]
+    if (&& (! (curteam)) (! $startedSurvival)) [ team RVSF ]; sleep 0 [ checkzone ]
   ]
 ]
 
diff --git a/packages/maps/official/ac_stellar.cgz b/packages/maps/official/ac_stellar.cgz
index 7daafc9e..fb914a99 100644
Binary files a/packages/maps/official/ac_stellar.cgz and b/packages/maps/official/ac_stellar.cgz differ