diff --git a/maps/cave_miner.lua b/maps/cave_miner.lua
index acbb58b0..10fd3d4f 100644
--- a/maps/cave_miner.lua
+++ b/maps/cave_miner.lua
@@ -921,10 +921,8 @@ Darkness is a hazard in the mines, stay near your lamps..
 		global.player_hunger[player.name] = player_hunger_spawn_value
 		hunger_update(player, 0)
 		global.darkness_threat_level[player.name] = 0
-		player.insert {name = 'pistol', count = 1}
-		--player.insert {name = 'raw-fish', count = 1}		
-		player.insert {name = 'firearm-magazine', count = 16}			
-		--player.insert {name = 'iron-axe', count = 1}		
+		player.insert {name = 'pistol', count = 1}	
+		player.insert {name = 'firearm-magazine', count = 16}
 	end
 	create_cave_miner_button(player)
 	create_cave_miner_stats_gui(player)
diff --git a/maps/cratewood_forest.lua b/maps/cratewood_forest.lua
index b445a3bf..8ad80e7c 100644
--- a/maps/cratewood_forest.lua
+++ b/maps/cratewood_forest.lua
@@ -155,6 +155,16 @@ local function on_init()
 	end
 end
 
+local function on_entity_died(event)	
+	if not event.entity.valid then return end
+	if event.entity.type == "tree" then 
+		for _, entity in pairs (event.entity.surface.find_entities_filtered({area = {{event.entity.position.x - 4, event.entity.position.y - 4},{event.entity.position.x + 4, event.entity.position.y + 4}}, name = "fire-flame-on-tree"})) do
+			if entity.valid then entity.destroy() end
+		end
+	end		
+end
+
 event.on_init(on_init)
 event.add(defines.events.on_chunk_generated, on_chunk_generated)
+event.add(defines.events.on_entity_died, on_entity_died)
 event.add(defines.events.on_player_joined_game, on_player_joined_game)
\ No newline at end of file
diff --git a/maps/fish_defender/bouncy_shells.lua b/maps/fish_defender/bouncy_shells.lua
index 54303c67..f247afc2 100644
--- a/maps/fish_defender/bouncy_shells.lua
+++ b/maps/fish_defender/bouncy_shells.lua
@@ -33,8 +33,8 @@ local function bounce(surface, position, ammo)
 	end
 	
 	if not valid_entities[1] then return end
-	
-	for c = 1, math_random(3,5), 1 do
+
+	for c = 1, math_random(3,6), 1 do
 		create_projectile(surface, position, valid_entities[math_random(1, #valid_entities)].position, ammo)
 	end
 end
diff --git a/maps/fish_defender/fish_defender.lua b/maps/fish_defender/fish_defender.lua
index 17f4e02d..1a29d90d 100644
--- a/maps/fish_defender/fish_defender.lua
+++ b/maps/fish_defender/fish_defender.lua
@@ -541,13 +541,9 @@ local function biter_attack_wave()
 		global.wave_count = global.wave_count + 1
 	end
 	
-	local modifier = 0.0025
-	game.forces.enemy.set_ammo_damage_modifier("melee", global.wave_count * modifier)
-	game.forces.enemy.set_ammo_damage_modifier("biological", global.wave_count * modifier)
-	game.forces.enemy.set_ammo_damage_modifier("artillery-shell", global.wave_count * modifier)
-	game.forces.enemy.set_ammo_damage_modifier("flamethrower", global.wave_count * modifier)
-	game.forces.enemy.set_ammo_damage_modifier("laser-turret", global.wave_count * modifier)
-	global.biter_evasion_health_increase_factor = 1 + (global.wave_count * modifier)
+	game.forces.enemy.set_ammo_damage_modifier("melee", global.wave_count * 0.002)
+	game.forces.enemy.set_ammo_damage_modifier("biological", global.wave_count * 0.002)
+	global.biter_evasion_health_increase_factor = 1 + (global.wave_count * 0.0025)
 	
 	if global.wave_count % 50 == 0 then				
 		global.attack_wave_threat = global.wave_count * 8
@@ -749,7 +745,7 @@ local function is_game_lost()
 		end
 		
 		for _, player in pairs(game.connected_players) do
-			player.play_sound{path="utility/game_lost", volume_modifier=1}
+			player.play_sound{path="utility/game_lost", volume_modifier=0.75}
 		end				
 	end
 	
diff --git a/maps/fish_defender/market.lua b/maps/fish_defender/market.lua
index 5f58c79a..6d88310c 100644
--- a/maps/fish_defender/market.lua
+++ b/maps/fish_defender/market.lua
@@ -117,7 +117,7 @@ local function refresh_market_offers()
 		global.market.add_market_item({price = {{"coin", 3500}}, offer = {type = 'nothing', effect_description = special_descriptions["trapped-capsules"]}})
 	end	
 	if not global.explosive_bullets_unlocked then 
-		global.market.add_market_item({price = {{"coin", 5000}}, offer = {type = 'nothing', effect_description = special_descriptions["explosive-bullets"]}})
+		global.market.add_market_item({price = {{"coin", 4500}}, offer = {type = 'nothing', effect_description = special_descriptions["explosive-bullets"]}})
 	end
 	if not global.bouncy_shells_unlocked then 
 		global.market.add_market_item({price = {{"coin", 10000}}, offer = {type = 'nothing', effect_description = special_descriptions["bouncy-shells"]}})
diff --git a/maps/labyrinth.lua b/maps/labyrinth.lua
index 4a8fed40..160ce3e2 100644
--- a/maps/labyrinth.lua
+++ b/maps/labyrinth.lua
@@ -2,7 +2,7 @@
 require "maps.labyrinth_map_intro"
 require "modules.teleporters"
 require "modules.satellite_score"
-require "modules.landfill_reveals_nauvis"
+--require "modules.landfill_reveals_nauvis"
 
 local map_functions = require "tools.map_functions"
 local simplex_noise = require 'utils.simplex_noise'.d2
diff --git a/player_list.lua b/player_list.lua
index 0669d53e..8f8a0b3d 100644
--- a/player_list.lua
+++ b/player_list.lua
@@ -420,7 +420,7 @@ local function on_player_joined_game(event)
 	if not global.player_list_pokes_counter then global.player_list_pokes_counter = {} end	
 	
 	if player.gui.top.player_list_button == nil then
-		local button = player.gui.top.add({ type = "sprite-button", name = "player_list_button", sprite = "item/heavy-armor", tooltip = "Player List" })		
+		local button = player.gui.top.add({ type = "sprite-button", name = "player_list_button", sprite = "item/heavy-armor", tooltip = "Player List" })
 		button.style.minimal_height = 38
 		button.style.minimal_width = 38
 		button.style.top_padding = 2