diff --git a/config/defaults.cfg b/config/defaults.cfg
index f0030fcb..779e7a48 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -35,4 +35,5 @@ survBotsToAdd = 1
 timeBetChkPts = 60000
 timeUntilTele = 120000
 survMaxBots = 32
-spamSurvMsgs = 0
\ No newline at end of file
+spamSurvMsgs = 0
+nonSurvDefaults = 0
\ No newline at end of file
diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg
index 51b9e7b7..fb262419 100644
--- a/config/menus_bot.cfg
+++ b/config/menus_bot.cfg
@@ -108,17 +108,17 @@ survDifList = [ "10 1 60000 120000 20" "12 1 45000 90000 30" "14 2 30000 45000 5
 
 newmenu "Survival Mode"
 menuitemslider "Map: " 0 28 "$survMap" 1 [ "ac_aqueous" "ac_arabian" "ac_arctic" "ac_arid" "ac_complex" "ac_depot" "ac_desert" "ac_desert2" "ac_desert3" "ac_douze" "ac_edifice" "ac_elevation" "ac_gothic" "ac_iceroad" "ac_industrial" "ac_ingress" "ac_keller" "ac_mines" "ac_outpost" "ac_power" "ac_rattrap" "ac_scaffold" "ac_shine" "ac_snow" "ac_stellar" "ac_sunset" "ac_toxic" "ac_urban" "ac_werk" ] [ survMap = $arg1 ]
-menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survDifficulty = $arg1; tmpSurvCtr = 0; loop sdl 5 [ (at $survSetsList $sdl) =  (at (at $survDifList $survDifficulty) $tmpSurvCtr); += tmpSurvCtr 1 ] ]
+menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survDifficulty = $arg1; tmpSurvCtr = 0; loop sdl 5 [ (at $survSetsList $sdl) =  (at (at $survDifList $survDifficulty) $tmpSurvCtr); += tmpSurvCtr 1 ]; nonSurvDefaults = 0 ]
 menuitem [] -1
 menuitem "                       Customize" [ showmenu "Survival Mode - Customize" ]
 menuitem "                         Start!"  [ survival (at $defaultmaps $survMap) ]
 
 newmenu "Survival Mode - Customize"
-menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 []         [ survNumBots = $arg1 ]
-menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 []  [ survBotsToAdd = $arg1 ]
-menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1 ]
-menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntilTele" 10000 []  [ timeUntilTele = $arg1 ]
-menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1 ]
+menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 []         [ survNumBots = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 []  [ survBotsToAdd = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntilTele" 10000 []  [ timeUntilTele = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ]
 menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ "no" "yes" ] [ spamSurvMsgs = $arg1 ]
 menuitem [] -1
 menuitem "                                   Back" [ closemenu "Survival Mode - Customize" ]
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index 520438fe..cc304161 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -599,18 +599,18 @@ menuitemcheckbox "Awesome (2): "             "(soundmuted 98)" [ mutesound 98 (!
 
 newmenu "Kill Messages"
 menuitemvar [concat (c 9)Frag messages: ] [] []
-menuitemtextinput [Pistol: ]  [fragmessage 1] [ fragmessage 1 $arg1 ] [] 256
-menuitemtextinput [Carbine: ] [fragmessage 2] [ fragmessage 2 $arg1 ] [] 256
-menuitemtextinput [Shotgun: ] [fragmessage 3] [ fragmessage 3 $arg1 ] [] 256
-menuitemtextinput [SMG: ]     [fragmessage 4] [ fragmessage 4 $arg1 ] [] 256
-menuitemtextinput [Sniper: ]  [fragmessage 5] [ fragmessage 5 $arg1 ] [] 256
-menuitemtextinput [AR: ]      [fragmessage 6] [ fragmessage 6 $arg1 ] [] 256
-menuitemtextinput [CPistol: ] [fragmessage 7] [ fragmessage 7 $arg1 ] [] 256
-menuitemtextinput [Akimbo: ]  [fragmessage 9] [ fragmessage 9 $arg1 ] [] 256
+menuitemtextinput [Pistol: ]  [fragmessage 1] [ fragmessage 1 $arg1 ] [] 15
+menuitemtextinput [Carbine: ] [fragmessage 2] [ fragmessage 2 $arg1 ] [] 15
+menuitemtextinput [Shotgun: ] [fragmessage 3] [ fragmessage 3 $arg1 ] [] 15
+menuitemtextinput [SMG: ]     [fragmessage 4] [ fragmessage 4 $arg1 ] [] 15
+menuitemtextinput [Sniper: ]  [fragmessage 5] [ fragmessage 5 $arg1 ] [] 15
+menuitemtextinput [AR: ]      [fragmessage 6] [ fragmessage 6 $arg1 ] [] 15
+menuitemtextinput [CPistol: ] [fragmessage 7] [ fragmessage 7 $arg1 ] [] 15
+menuitemtextinput [Akimbo: ]  [fragmessage 9] [ fragmessage 9 $arg1 ] [] 15
 menuitem [] -1
 menuitemvar [concat (c 9)Gib messages: ] [] []
-menuitemtextinput [Knife: ]    [gibmessage 0] [ gibmessage 0 $arg1 ] [] 256
-menuitemtextinput [Shotgun: ]  [gibmessage 3] [ gibmessage 3 $arg1 ] [] 256
-menuitemtextinput [Sniper: ]   [gibmessage 5] [ gibmessage 5 $arg1 ] [] 256
-menuitemtextinput [Grenades: ] [gibmessage 8] [ gibmessage 8 $arg1 ] [] 256
+menuitemtextinput [Knife: ]    [gibmessage 0] [ gibmessage 0 $arg1 ] [] 15
+menuitemtextinput [Shotgun: ]  [gibmessage 3] [ gibmessage 3 $arg1 ] [] 15
+menuitemtextinput [Sniper: ]   [gibmessage 5] [ gibmessage 5 $arg1 ] [] 15
+menuitemtextinput [Grenades: ] [gibmessage 8] [ gibmessage 8 $arg1 ] [] 15
 
diff --git a/config/survival.cfg b/config/survival.cfg
index 8664ffbe..ecb72985 100644
--- a/config/survival.cfg
+++ b/config/survival.cfg
@@ -105,7 +105,14 @@ checkzone = [
     if (&& (! $startedSurvival) (>= (- (millis) $startPreSurvMillis) $timeUntilTele)) [ teleportPlayer ]
     if (&& (>= (- (millis) $lastCheckPoint) $timeBetChkPts) (&& $startedSurvival $gotCheckPoint)) [ increaseDifficulty ]
     if (&& (! $startedOBCount) (&& (! (isInZone)) $startedSurvival)) [ startOBCount ]
-    if (&& $startedSurvival (&& (! (alive)) (>= (- (millis) $startSurvMillis) 500))) [ finalSurvMillis = (- (millis) $startSurvMillis); endSurvival (concatword (at (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) $survDifficulty) (c 3) " You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.") ]
+    if (&& $startedSurvival (&& (! (alive)) (>= (- (millis) $startSurvMillis) 500))) [
+      finalSurvMillis = (- (millis) $startSurvMillis);
+      if $nonSurvDefaults [
+        endSurvival (concatword "[CUSTOM] " (c 3) "You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.")
+      ] [
+        endSurvival (concatword (at (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) $survDifficulty) (c 3) " You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.")
+      ]
+    ]
     if (&& (! (curteam)) (! $startedSurvival)) [ team RVSF ]; sleep 0 [ checkzone ]
   ]
 ]
diff --git a/source/src/world.h b/source/src/world.h
index 73205917..b042b13a 100644
--- a/source/src/world.h
+++ b/source/src/world.h
@@ -127,7 +127,7 @@ struct mapstats
 #define OUTBORDRAD(x,y,rad) (int(x-rad)<MINBORD || int(y-rad)<MINBORD || int(x+rad)>=ssize-MINBORD || (y+rad)>=ssize-MINBORD)
 #define MAXMHEIGHT 30
 #define MAXMAREA 10000
-#define MAXHHITS 5000
+#define MAXHHITS 6000
 #define MINFF 2500
 
 struct block { int x, y, xs, ys; };