diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index b8b47aa8656..3d7d14e59ce 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -15,7 +15,7 @@ GLOBAL_VAR(church_name)
 
 	return name
 
-// TODO: Remove this. Its always gonna be NAS Trurl
+// AA TODO: Remove this. Its always gonna be NAS Trurl
 /proc/command_name()
 	return "NAS Trurl"
 
diff --git a/code/controllers/configuration/sections/vote_configuration.dm b/code/controllers/configuration/sections/vote_configuration.dm
index 92edd5abbb2..5c280c579fb 100644
--- a/code/controllers/configuration/sections/vote_configuration.dm
+++ b/code/controllers/configuration/sections/vote_configuration.dm
@@ -16,6 +16,8 @@
 	var/prevent_dead_voting = FALSE
 	/// Default to players not voting
 	var/disable_default_vote = TRUE
+	/// Enable map voting?
+	var/enable_map_voting = FALSE
 
 /datum/configuration_section/vote_configuration/load_data(list/data)
 	// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
@@ -23,6 +25,7 @@
 	CONFIG_LOAD_BOOL(allow_mode_votes, data["allow_vote_mode"])
 	CONFIG_LOAD_BOOL(prevent_dead_voting, data["prevent_dead_voting"])
 	CONFIG_LOAD_BOOL(disable_default_vote, data["disable_default_vote"])
+	CONFIG_LOAD_BOOL(enable_map_voting, data["enable_map_voting"])
 
 	CONFIG_LOAD_NUM(vote_delay, data["vote_delay"])
 	CONFIG_LOAD_NUM(vote_time, data["vote_time"])
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 990623d619f..a816c18d0c5 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -62,7 +62,7 @@ SUBSYSTEM_DEF(mapping)
 	log_startup_progress("Successfully populated lavaland in [stop_watch(lavaland_setup_timer)]s.")
 
 	// Now we make a list of areas for teleport locs
-	// TOOD: Make these locs into lists on the SS itself, not globs
+	// AA TODO: Make these locs into lists on the SS itself, not globs
 	for(var/area/AR in world)
 		if(AR.no_teleportlocs)
 			continue
@@ -96,7 +96,7 @@ SUBSYSTEM_DEF(mapping)
 	// load in extra levels of space ruins
 	var/load_zlevels_timer = start_watch()
 	log_startup_progress("Creating random space levels...")
-	var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+	var/num_extra_space = rand(GLOB.configuration.ruins.extra_levels_min, GLOB.configuration.ruins.extra_levels_max)
 	for(var/i in 1 to num_extra_space)
 		GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
 	log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 127794727c4..2d21a4d33be 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -10,7 +10,7 @@ SUBSYSTEM_DEF(ticker)
 	/// Time the world started, relative to world.time
 	var/round_start_time = 0
 	/// Default timeout for if world.Reboot() doesnt have a time specified
-	var/const/restart_timeout = 600
+	var/const/restart_timeout = 75 SECONDS
 	/// Current status of the game. See code\__DEFINES\game.dm
 	var/current_state = GAME_STATE_STARTUP
 	/// Do we want to force-start as soon as we can
@@ -127,6 +127,8 @@ SUBSYSTEM_DEF(ticker)
 			auto_toggle_ooc(TRUE) // Turn it on
 			declare_completion()
 			addtimer(CALLBACK(src, .proc/call_reboot), 5 SECONDS)
+			if(GLOB.configuration.vote.enable_map_voting)
+				SSvote.initiate_vote("map", "the server", TRUE) // Start a map vote. Timing is a little tight here but we should be good.
 
 /datum/controller/subsystem/ticker/proc/call_reboot()
 	if(mode.station_was_nuked)
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 3be1df48458..8a5c2118794 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -269,8 +269,6 @@
 				for(var/mob/M in GLOB.player_list)
 					if(!isnewplayer(M) && !M.client.karma_spent && !(M.client.ckey in GLOB.karma_spenders) && !M.get_preference(PREFTOGGLE_DISABLE_KARMA_REMINDER))
 						to_chat(M, "<i>You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under Special Verbs tab, Award Karma.</i>")
-				if(config.map_voting_enabled)
-					SSvote.initiate_vote("map", "the server", TRUE)
 
 		if(SHUTTLE_ESCAPE)
 			if(time_left <= 0)
diff --git a/config/example/config.toml b/config/example/config.toml
index 41621e185ff..18157dbe776 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -755,6 +755,8 @@ autotransfer_interval_time = 18000
 prevent_dead_voting = false
 # Default to players not voting by default
 disable_default_vote = true
+# Enable voting for a map on end round
+enable_map_voting = false
 
 
 ################################################################