diff --git a/config/survival.cfg b/config/survival.cfg
index 3384c0f2..ea98dd3d 100644
--- a/config/survival.cfg
+++ b/config/survival.cfg
@@ -52,8 +52,7 @@ const survival [
     if (strstr $defaultmaps (curmap 1)) [ survMap = (findlist $defaultmaps (curmap 1)) ]
     setOfcZones; checkzone
   ]
-  setbottimeout 2 $MAX_BOT_MATCH_LENGTH
-  votemap (modenum btdm) $arg1
+  btdm $arg1 $MAX_BOT_MATCH_LENGTH
 ]
 
 const startSurvival [
@@ -194,10 +193,10 @@ const increaseDifficulty [
 
 const endSurvival [
   if (! $survIsFinished) [
-    tmp_survstr = $arg1; survIsFinished = 1; startedSurvival = 0; survNumBots = (at $tmpSurvSets 0)
+    tmp_survstr = $arg1; tmp_nargs = $numargs; survIsFinished = 1; startedSurvival = 0; survNumBots = (at $tmpSurvSets 0)
     checkinit mapstartonce [
       if (! $dyngamma) [ gamma (at $survOrigSets 0) ]; gamespeed 100
-      if (< $numargs 2) [
+      if (< $tmp_nargs 2) [
         echo (green)Bot Survival results for map: (white) (at $tmpSurvSets 1)
         if (!= (at $tmpSurvSets 2) (at $tmpSurvSets 3)) [
           if (= (at $tmpSurvSets 5) 1) [ sleep 5 [ echo (concatword (yellow) (format [you were %1 by %2] (gibmessage (at $tmpSurvSets 4)) (at $tmpSurvSets 6))) ] ] [
@@ -214,6 +213,6 @@ const endSurvival [
 ]
 
 // List of aliases that need to be cleared from saved.cfg on quit:
-const survAliases (concat $survResetAliases [resetSurvAliases genSurvDifStr survival tmpSurvSets curSurvDifficulty survLastKill survTimeBetKills startPreSurvMillis startSurvival startedSurvival setzone survOfcZones setOfcZones survMapIndex tmpSurvZone findCenter midZoneX midZoneY teleportPlayer survTeleported isInZone checkzone startOBCount startedOBCount startOBMillis backInZone tmpSCtr increaseDifficulty lastCheckPoint tmpSurvInt endSurvival tmp_survstr survIsFinished tmpstrlist finalSurvMillis zone survSetsList survDifList survSetDif survResetAliases survAliases])
+const survAliases (concat $survResetAliases [resetSurvAliases genSurvDifStr survival tmpSurvSets curSurvDifficulty survLastKill survTimeBetKills startPreSurvMillis startSurvival startedSurvival setzone survOfcZones setOfcZones survMapIndex tmpSurvZone findCenter midZoneX midZoneY teleportPlayer survTeleported isInZone checkzone startOBCount startedOBCount startOBMillis backInZone tmpSCtr increaseDifficulty lastCheckPoint tmpSurvInt endSurvival tmp_survstr tmp_nargs survIsFinished tmpstrlist finalSurvMillis zone survSetsList survDifList survSetDif survResetAliases survAliases])
 addListOnQuit $survAliases
 persistidents 1