diff --git a/functions/basic_markets.lua b/functions/basic_markets.lua
index ace48fba..08a23e84 100644
--- a/functions/basic_markets.lua
+++ b/functions/basic_markets.lua
@@ -25,6 +25,7 @@ market.ammo = {
 	["explosive-rocket"] = {value = 12, rarity = 5},
 	["atomic-bomb"] = {value = 5000, rarity = 10},
 	["flamethrower-ammo"] = {value = 20, rarity = 6},
+	["explosives"] = {value = 2, rarity = 1},
 }
 
 market.caspules = {
@@ -37,6 +38,7 @@ market.caspules = {
 	["destroyer-capsule"] = {value = 24, rarity = 7},
 	["discharge-defense-remote"] = {value = 64, rarity = 6},
 	["artillery-targeting-remote"] = {value = 32, rarity = 7},
+	["raw-fish"] = {value = 6, rarity = 1},
 }
 
 market.armor = {
@@ -88,6 +90,9 @@ market.logistic = {
 	["splitter"] = {value = 16, rarity = 1},
 	["fast-splitter"] = {value = 48, rarity = 4},
 	["express-splitter"] = {value = 128, rarity = 7},
+	["loader"] = {value = 256, rarity = 2},
+	["fast-loader'"] = {value = 512, rarity = 5},
+	["express-loader"] = {value = 768, rarity = 8},
 	["burner-inserter"] = {value = 4, rarity = 1},
 	["inserter"] = {value = 8, rarity = 1},
 	["long-handed-inserter"] = {value = 12, rarity = 2},
@@ -178,7 +183,7 @@ function random_type_market(surface, position, rarity)
 	local items = get_market_item_list({types[1], types[2]}, rarity)
 	if not items then return end
 	if #items > 0 then table.shuffle_table(items) end
-	local market = surface.create_entity({name = "market", position = position})
+	local market = surface.create_entity({name = "market", position = position, force="neutral"})
 	for i = 1, math.random(5, 10), 1 do
 		if not items[i] then break end
 		market.add_market_item(items[i])
diff --git a/modules/corpse_markers.lua b/modules/corpse_markers.lua
index a541a04c..f1ad8169 100644
--- a/modules/corpse_markers.lua
+++ b/modules/corpse_markers.lua
@@ -3,6 +3,7 @@ local function draw_map_tag(surface, force, position)
 end
 
 local function is_tag_valid(tag)
+	if not tag.icon then return end
 	if tag.icon.type ~= "item" then return end
 	if tag.icon.name ~= "heavy-armor" then return end
 	if tag.text ~= "   " then return end
diff --git a/modules/rpg.lua b/modules/rpg.lua
index 67423c54..47a0a502 100644
--- a/modules/rpg.lua
+++ b/modules/rpg.lua
@@ -448,6 +448,7 @@ local function on_gui_click(event)
 	local index = element.name
 	local player = game.players[event.player_index]
 	if not global.rpg[player.index][index] then return end
+	if not player.character then return end
 	
 	if event.button == defines.mouse_button_type.right then
 		for a = 1, 5, 1 do
@@ -470,6 +471,7 @@ end
 local xp_yield = {
 	["behemoth-biter"] = 16,
 	["behemoth-spitter"] = 16,
+	["behemoth-worm-turret"] = 48,
 	["big-biter"] = 8,
 	["big-spitter"] = 8,
 	["big-worm-turret"] = 32,
@@ -480,8 +482,8 @@ local xp_yield = {
 	["medium-biter"] = 4,
 	["medium-spitter"] = 4,
 	["medium-worm-turret"] = 16,
-	["small-biter"] = 1.5,
-	["small-spitter"] = 1.5,
+	["small-biter"] = 1,
+	["small-spitter"] = 1,
 	["small-worm-turret"] = 8,
 	["spitter-spawner"] = 32,
 }