diff --git a/maps/mountain_fortress_v2/main.lua b/maps/mountain_fortress_v2/main.lua
index 5b01eb31..283db7c2 100644
--- a/maps/mountain_fortress_v2/main.lua
+++ b/maps/mountain_fortress_v2/main.lua
@@ -106,7 +106,9 @@ function reset_map()
 	global.wave_defense.surface_index = global.active_surface_index
 	global.wave_defense.target = global.locomotive_cargo
 	global.wave_defense.side_target_search_radius = 768
-	
+	global.wave_defense.unit_group_command_step_length = 32
+	global.wave_defense.nest_building_density = 32
+	global.wave_defense.threat_gain_multiplier = 3
 	global.wave_defense.game_lost = false
 	
 	--for _, p in pairs(game.connected_players) do
diff --git a/maps/mountain_fortress_v2/terrain.lua b/maps/mountain_fortress_v2/terrain.lua
index 38aeef70..3eba3d6e 100644
--- a/maps/mountain_fortress_v2/terrain.lua
+++ b/maps/mountain_fortress_v2/terrain.lua
@@ -67,7 +67,7 @@ local function process_level_5_position(p, seed, tiles, entities, markets, treas
 	local small_caves = get_noise("small_caves", p, seed)
 	local noise_cave_ponds = get_noise("cave_ponds", p, seed)
 	
-	if small_caves > -0.08 and small_caves < 0.08 then
+	if small_caves > -0.10 and small_caves < 0.10 then
 		tiles[#tiles + 1] = {name = "dirt-7", position = p}
 		if math_random(1,512) == 1 then treasure[#treasure + 1] = p end
 		if math_random(1,2) > 1 then entities[#entities + 1] = {name = rock_raffle[math_random(1, #rock_raffle)], position = p} end
@@ -84,7 +84,7 @@ local function process_level_5_position(p, seed, tiles, entities, markets, treas
 		return
 	end	
 	
-	if small_caves > -0.28 and small_caves < 0.28 then
+	if small_caves > -0.30 and small_caves < 0.30 then
 		if noise_cave_ponds > 0.35 then		
 			tiles[#tiles + 1] = {name = "dirt-" .. math.random(1, 4), position = p}
 			if math_random(1,128) == 1 then treasure[#treasure + 1] = p end
diff --git a/modules/wave_defense/main.lua b/modules/wave_defense/main.lua
index faea3eb9..51c55003 100644
--- a/modules/wave_defense/main.lua
+++ b/modules/wave_defense/main.lua
@@ -163,7 +163,7 @@ local function set_enemy_evolution()
 	
 	if evolution_factor > 1 then
 		--damage_increase = damage_increase + (evolution_factor - 1)
-		biter_health_boost = biter_health_boost + (evolution_factor - 1) * 2
+		--biter_health_boost = biter_health_boost + (evolution_factor - 1) * 2
 		evolution_factor = 1
 	end
 
@@ -422,7 +422,7 @@ function reset_wave_defense()
 		group_size = 2,
 		last_wave = game.tick,
 		max_active_biters = 1024,
-		max_active_unit_groups = 8,
+		max_active_unit_groups = 6,
 		max_biter_age = 3600 * 60,
 		max_group_size = 192,
 		nest_building_chance = 4,											--high value = less chance
@@ -434,8 +434,8 @@ function reset_wave_defense()
 		surface_index = 1,
 		threat = 0,
 		threat_gain_multiplier = 2,
-		unit_group_command_delay = 3600 * 8,
-		unit_group_command_step_length = 80,
+		unit_group_command_delay = 3600 * 15,
+		unit_group_command_step_length = 32,
 		unit_group_last_command = {},
 		unit_groups = {},
 		wave_interval = 3600,
diff --git a/modules/wave_defense/threat_events.lua b/modules/wave_defense/threat_events.lua
index ed567cb4..305a5863 100644
--- a/modules/wave_defense/threat_events.lua
+++ b/modules/wave_defense/threat_events.lua
@@ -19,7 +19,7 @@ function build_nest()
 	if not group.members[1] then return end
 	local unit = group.members[math_random(1, #group.members)]
 	if not unit.valid then return end	
-	local position = unit.surface.find_non_colliding_position("rocket-silo", unit.position, 9, 1)
+	local position = unit.surface.find_non_colliding_position("biter-spawner", unit.position, 16, 1)
 	if not position then return end
 	local r = global.wave_defense.nest_building_density	
 	if unit.surface.count_entities_filtered({type = "unit-spawner", area = {{position.x - r, position.y - r},{position.x + r, position.y + r}}}) > 0 then return end
@@ -44,7 +44,7 @@ function build_worm()
 	if not unit.valid then return end
 	wave_defense_set_worm_raffle(global.wave_defense.wave_number)
 	local worm = wave_defense_roll_worm_name()
-	local position = unit.surface.find_non_colliding_position("biter-spawner", unit.position, 9, 1)
+	local position = unit.surface.find_non_colliding_position("assembling-machine-1", unit.position, 8, 1)
 	if not position then return end
 	local r = global.wave_defense.worm_building_density
 	if unit.surface.count_entities_filtered({type = "turret", area = {{position.x - r, position.y - r},{position.x + r, position.y + r}}}) > 0 then return end