diff --git a/lua/charactertweakdata.lua b/lua/charactertweakdata.lua
index 8f0c657..9c42aa5 100644
--- a/lua/charactertweakdata.lua
+++ b/lua/charactertweakdata.lua
@@ -673,7 +673,6 @@ Hooks:PostHook(CharacterTweakData, "init", "eclipse_init", function(self)
 
 	-- surrender presets
 	self.security.surrender = self.presets.surrender.weak
-	self.cop_scared.surrender = self.presets.surrender.weak
 	self.cop.surrender = self.presets.surrender.weak
 	self.fbi.surrender = self.presets.surrender.weak
 	self.swat.surrender = self.presets.surrender.weak
diff --git a/lua/criminalsmanager.lua b/lua/criminalsmanager.lua
index 2b0d0af..df36968 100644
--- a/lua/criminalsmanager.lua
+++ b/lua/criminalsmanager.lua
@@ -1,4 +1,4 @@
-if Global.game_settings.one_down then
+if Global.game_settings and Global.game_settings.one_down then
 	CriminalsManager.MAX_NR_TEAM_AI = 1
 else
 	CriminalsManager.MAX_NR_TEAM_AI = 2
diff --git a/lua/elementspawnenemydummy.lua b/lua/elementspawnenemydummy.lua
index 1044ab0..4274fb7 100644
--- a/lua/elementspawnenemydummy.lua
+++ b/lua/elementspawnenemydummy.lua
@@ -50,37 +50,93 @@ local enemy_replacements = {
 }
 enemy_replacements.hard = enemy_replacements.normal
 local enemy_mapping = {
-	[Idstring("units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"):key()] = "dozer_1",
-	[Idstring("units/payday2/characters/ene_bulldozer_2/ene_bulldozer_2"):key()] = "dozer_1",
-	[Idstring("units/payday2/characters/ene_bulldozer_3/ene_bulldozer_3"):key()] = "dozer_1",
-	[Idstring("units/payday2/characters/ene_city_heavy_g36/ene_city_heavy_g36"):key()] = "heavy_1",
-	[Idstring("units/payday2/characters/ene_city_heavy_r870/ene_city_heavy_r870"):key()] = "heavy_2",
-	[Idstring("units/payday2/characters/ene_city_shield/ene_city_shield"):key()] = "shield",
-	[Idstring("units/payday2/characters/ene_city_swat_1/ene_city_swat_1"):key()] = "swat_1",
-	[Idstring("units/payday2/characters/ene_city_swat_2/ene_city_swat_2"):key()] = "swat_2",
-	[Idstring("units/payday2/characters/ene_city_swat_3/ene_city_swat_3"):key()] = "swat_3",
-	[Idstring("units/payday2/characters/ene_city_swat_r870/ene_city_swat_r870"):key()] = "swat_2",
-	[Idstring("units/payday2/characters/ene_fbi_heavy_1/ene_fbi_heavy_1"):key()] = "heavy_1",
-	[Idstring("units/payday2/characters/ene_fbi_heavy_r870/ene_fbi_heavy_r870"):key()] = "heavy_2",
-	[Idstring("units/payday2/characters/ene_fbi_swat_1/ene_fbi_swat_1"):key()] = "swat_1",
-	[Idstring("units/payday2/characters/ene_fbi_swat_2/ene_fbi_swat_2"):key()] = "swat_2",
-	[Idstring("units/payday2/characters/ene_shield_1/ene_shield_1"):key()] = "shield",
-	[Idstring("units/payday2/characters/ene_shield_2/ene_shield_2"):key()] = "shield",
-	[Idstring("units/payday2/characters/ene_sniper_1/ene_sniper_1"):key()] = "sniper",
-	[Idstring("units/payday2/characters/ene_sniper_2/ene_sniper_2"):key()] = "sniper",
-	[Idstring("units/payday2/characters/ene_swat_1/ene_swat_1"):key()] = "swat_1",
-	[Idstring("units/payday2/characters/ene_swat_2/ene_swat_2"):key()] = "swat_2",
-	[Idstring("units/payday2/characters/ene_swat_heavy_1/ene_swat_heavy_1"):key()] = "heavy_1",
-	[Idstring("units/payday2/characters/ene_swat_heavy_r870/ene_swat_heavy_r870"):key()] = "heavy_2",
-	[Idstring("units/payday2/characters/ene_medic_m4/ene_medic_m4"):key()] = "medic_1",
-	[Idstring("units/payday2/characters/ene_medic_r870/ene_medic_r870"):key()] = "medic_2",
-	[Idstring("units/payday2/characters/ene_tazer_1/ene_tazer_1"):key()] = "taser",
-	[Idstring("units/payday2/characters/ene_spook_1/ene_spook_1"):key()] = "cloaker",
-	[Idstring("units/pd2_dlc_gitgud/characters/ene_zeal_swat_heavy/ene_zeal_swat_heavy"):key()] = "heavy_1",
-	[Idstring("units/pd2_dlc_gitgud/characters/ene_zeal_swat_shield/ene_zeal_swat_shield"):key()] = "shield",
-	[Idstring("units/pd2_dlc_gitgud/characters/ene_zeal_swat/ene_zeal_swat"):key()] = "swat_1",
-	[Idstring("units/pd2_dlc_usm1/characters/ene_male_marshal_marksman_1/ene_male_marshal_marksman_1"):key()] = "swat_1",
-	[Idstring("units/pd2_dlc_usm2/characters/ene_male_marshal_shield_1/ene_male_marshal_shield_1"):key()] = "shield",
+	[("units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"):key()] = "dozer_1",
+	[("units/payday2/characters/ene_bulldozer_2/ene_bulldozer_2"):key()] = "dozer_1",
+	[("units/payday2/characters/ene_bulldozer_3/ene_bulldozer_3"):key()] = "dozer_1",
+	[("units/payday2/characters/ene_city_heavy_g36/ene_city_heavy_g36"):key()] = "heavy_1",
+	[("units/payday2/characters/ene_city_heavy_r870/ene_city_heavy_r870"):key()] = "heavy_2",
+	[("units/payday2/characters/ene_city_shield/ene_city_shield"):key()] = "shield",
+	[("units/payday2/characters/ene_city_swat_1/ene_city_swat_1"):key()] = "swat_1",
+	[("units/payday2/characters/ene_city_swat_2/ene_city_swat_2"):key()] = "swat_2",
+	[("units/payday2/characters/ene_city_swat_3/ene_city_swat_3"):key()] = "swat_3",
+	[("units/payday2/characters/ene_city_swat_r870/ene_city_swat_r870"):key()] = "swat_2",
+	[("units/payday2/characters/ene_fbi_heavy_1/ene_fbi_heavy_1"):key()] = "heavy_1",
+	[("units/payday2/characters/ene_fbi_heavy_r870/ene_fbi_heavy_r870"):key()] = "heavy_2",
+	[("units/payday2/characters/ene_fbi_swat_1/ene_fbi_swat_1"):key()] = "swat_1",
+	[("units/payday2/characters/ene_fbi_swat_2/ene_fbi_swat_2"):key()] = "swat_2",
+	[("units/payday2/characters/ene_shield_1/ene_shield_1"):key()] = "shield",
+	[("units/payday2/characters/ene_shield_2/ene_shield_2"):key()] = "shield",
+	[("units/payday2/characters/ene_sniper_1/ene_sniper_1"):key()] = "sniper",
+	[("units/payday2/characters/ene_sniper_2/ene_sniper_2"):key()] = "sniper",
+	[("units/payday2/characters/ene_swat_1/ene_swat_1"):key()] = "swat_1",
+	[("units/payday2/characters/ene_swat_2/ene_swat_2"):key()] = "swat_2",
+	[("units/payday2/characters/ene_swat_heavy_1/ene_swat_heavy_1"):key()] = "heavy_1",
+	[("units/payday2/characters/ene_swat_heavy_r870/ene_swat_heavy_r870"):key()] = "heavy_2",
+	[("units/payday2/characters/ene_medic_m4/ene_medic_m4"):key()] = "medic_1",
+	[("units/payday2/characters/ene_medic_r870/ene_medic_r870"):key()] = "medic_2",
+	[("units/payday2/characters/ene_tazer_1/ene_tazer_1"):key()] = "taser",
+	[("units/payday2/characters/ene_spook_1/ene_spook_1"):key()] = "cloaker",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_swat_heavy/ene_zeal_swat_heavy"):key()] = "heavy_1",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_swat_shield/ene_zeal_swat_shield"):key()] = "shield",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_swat/ene_zeal_swat"):key()] = "swat_1",
+	[("units/pd2_dlc_usm1/characters/ene_male_marshal_marksman_1/ene_male_marshal_marksman_1"):key()] = "swat_1",
+	[("units/pd2_dlc_usm2/characters/ene_male_marshal_shield_1/ene_male_marshal_shield_1"):key()] = "shield",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_bulldozer_2/ene_zeal_bulldozer_2"):key()] = "dozer_1",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_bulldozer_3/ene_zeal_bulldozer_3"):key()] = "dozer_1",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_bulldozer/ene_zeal_bulldozer"):key()] = "dozer_1",
+	[("units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic"):key()] = "dozer_1",
+	[("units/pd2_dlc_drm/characters/ene_bulldozer_minigun/ene_bulldozer_minigun"):key()] = "dozer_1",
+	[("units/pd2_dlc_drm/characters/ene_bulldozer_medic/ene_bulldozer_medic"):key()] = "dozer_1",
+	[("units/pd2_dlc_mad/characters/ene_akan_fbi_tank_r870/ene_akan_fbi_tank_r870"):key()] = "dozer_1",
+	[("units/pd2_dlc_mad/characters/ene_akan_fbi_tank_saiga/ene_akan_fbi_tank_saiga"):key()] = "dozer_1",
+	[("units/pd2_dlc_mad/characters/ene_akan_fbi_tank_rpk_lmg/ene_akan_fbi_tank_rpk_lmg"):key()] = "dozer_1",
+	[("units/pd2_dlc_hvh/characters/ene_bulldozer_hvh_1/ene_bulldozer_hvh_1"):key()] = "dozer_1",
+	[("units/pd2_dlc_hvh/characters/ene_bulldozer_hvh_2/ene_bulldozer_hvh_2"):key()] = "dozer_1",
+	[("units/pd2_dlc_hvh/characters/ene_bulldozer_hvh_3/ene_bulldozer_hvh_3"):key()] = "dozer_1",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_bulldozer_2/ene_murkywater_bulldozer_2"):key()] = "dozer_1",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_bulldozer_3/ene_murkywater_bulldozer_3"):key()] = "dozer_1",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_bulldozer_4/ene_murkywater_bulldozer_4"):key()] = "dozer_1",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_bulldozer_1/ene_murkywater_bulldozer_1"):key()] = "dozer_1",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_bulldozer_medic/ene_murkywater_bulldozer_medic"):key()] = "dozer_1",
+	[("units/pd2_dlc_bex/characters/ene_swat_dozer_policia_federale_r870/ene_swat_dozer_policia_federale_r870"):key()] = "dozer_1",
+	[("units/pd2_dlc_bex/characters/ene_swat_dozer_policia_federale_saiga/ene_swat_dozer_policia_federale_saiga"):key()] = "dozer_1",
+	[("units/pd2_dlc_bex/characters/ene_swat_dozer_policia_federale_m249/ene_swat_dozer_policia_federale_m249"):key()] = "dozer_1",
+	[("units/pd2_dlc_bex/characters/ene_swat_dozer_policia_federale_minigun/ene_swat_dozer_policia_federale_minigun"):key()] = "dozer_1",
+	[("units/pd2_dlc_bex/characters/ene_swat_dozer_medic_policia_federale/ene_swat_dozer_medic_policia_federale"):key()] = "dozer_1",
+	[("units/pd2_dlc_mad/characters/ene_akan_cs_shield_c45/ene_akan_cs_shield_c45"):key()] = "shield",
+	[("units/pd2_dlc_mad/characters/ene_akan_fbi_shield_sr2_smg/ene_akan_fbi_shield_sr2_smg"):key()] = "shield",
+	[("units/pd2_dlc_mad/characters/ene_akan_fbi_shield_dw_sr2_smg/ene_akan_fbi_shield_dw_sr2_smg"):key()] = "shield",
+	[("units/pd2_dlc_hvh/characters/ene_shield_hvh_2/ene_shield_hvh_2"):key()] = "shield",
+	[("units/pd2_dlc_hvh/characters/ene_shield_hvh_1/ene_shield_hvh_1"):key()] = "shield",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_shield/ene_murkywater_shield"):key()] = "shield",
+	[("units/pd2_dlc_bex/characters/ene_swat_shield_policia_federale_c45/ene_swat_shield_policia_federale_c45"):key()] = "shield",
+	[("units/pd2_dlc_bex/characters/ene_swat_shield_policia_federale_mp9/ene_swat_shield_policia_federale_mp9"):key()] = "shield",
+	[("units/pd2_dlc_mad/characters/ene_akan_cs_swat_sniper_svd_snp/ene_akan_cs_swat_sniper_svd_snp"):key()] = "sniper",
+	[("units/pd2_dlc_hvh/characters/ene_sniper_hvh_2/ene_sniper_hvh_2"):key()] = "sniper",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_sniper/ene_murkywater_sniper"):key()] = "sniper",
+	[("units/pd2_dlc_bex/characters/ene_swat_policia_sniper/ene_swat_policia_sniper"):key()] = "sniper",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_tazer/ene_zeal_tazer"):key()] = "taser",
+	[("units/pd2_dlc_mad/characters/ene_akan_cs_tazer_ak47_ass/ene_akan_cs_tazer_ak47_ass"):key()] = "taser",
+	[("units/pd2_dlc_hvh/characters/ene_tazer_hvh_1/ene_tazer_hvh_1"):key()] = "taser",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_tazer/ene_murkywater_tazer"):key()] = "taser",
+	[("units/pd2_dlc_bex/characters/ene_swat_tazer_policia_federale/ene_swat_tazer_policia_federale"):key()] = "taser",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_cloaker/ene_zeal_cloaker"):key()] = "cloaker",
+	[("units/pd2_dlc_mad/characters/ene_akan_fbi_spooc_asval_smg/ene_akan_fbi_spooc_asval_smg"):key()] = "cloaker",
+	[("units/pd2_dlc_hvh/characters/ene_spook_hvh_1/ene_spook_hvh_1"):key()] = "cloaker",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_cloaker/ene_murkywater_cloaker"):key()] = "cloaker",
+	[("units/pd2_dlc_bex/characters/ene_swat_cloaker_policia_federale/ene_swat_cloaker_policia_federale"):key()] = "cloaker",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_medic_m4/ene_zeal_medic_m4"):key()] = "medic_1",
+	[("units/pd2_dlc_mad/characters/ene_akan_medic_ak47_ass/ene_akan_medic_ak47_ass"):key()] = "medic_1",
+	[("units/pd2_dlc_hvh/characters/ene_medic_hvh_m4/ene_medic_hvh_m4"):key()] = "medic_1",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_medic/ene_murkywater_medic"):key()] = "medic_1",
+	[("units/pd2_dlc_bex/characters/ene_swat_medic_policia_federale/ene_swat_medic_policia_federale"):key()] = "medic_1",
+	[("units/pd2_dlc_gitgud/characters/ene_zeal_medic_r870/ene_zeal_medic_r870"):key()] = "medic_2",
+	[("units/pd2_dlc_mad/characters/ene_akan_medic_r870/ene_akan_medic_r870"):key()] = "medic_2",
+	[("units/pd2_dlc_hvh/characters/ene_medic_hvh_r870/ene_medic_hvh_r870"):key()] = "medic_2",
+	[("units/pd2_dlc_bph/characters/ene_murkywater_medic_r870/ene_murkywater_medic_r870"):key()] = "medic_2",
+	[("units/pd2_dlc_bex/characters/ene_swat_medic_policia_federale_r870/ene_swat_medic_policia_federale_r870"):key()] = "medic_2",
+	[("units/pd2_dlc_usm1/characters/ene_male_marshal_marksman_2/ene_male_marshal_marksman_2"):key()] = "swat_1",
+	[("units/pd2_dlc_usm2/characters/ene_male_marshal_shield_2/ene_male_marshal_shield_2"):key()] = "shield",
 }
 
 local difficulty
@@ -89,7 +145,12 @@ if tweak_data.levels[level_id] and tweak_data.levels[level_id].group_ai_state ==
 else
 	difficulty = Global.game_settings and Global.game_settings.difficulty or "normal"
 end
+
+local mission_script_elements = StreamHeist:mission_script_patches()
 Hooks:PostHook(ElementSpawnEnemyDummy, "init", "sh_init", function(self)
+	local element_mapping = mission_script_elements and mission_script_elements[self._id]
+	self._enemy_mapping = element_mapping and element_mapping.enemy
+
 	local mapped_name = enemy_mapping[self._enemy_name:key()]
 	local mapped_unit = enemy_replacements[difficulty] and enemy_replacements[difficulty][mapped_name]
 	local mapped_unit_ids = mapped_unit and Idstring(mapped_unit)
@@ -97,3 +158,23 @@ Hooks:PostHook(ElementSpawnEnemyDummy, "init", "sh_init", function(self)
 		self._enemy_name = mapped_unit_ids
 	end
 end)
+
+local produce_original = ElementSpawnEnemyDummy.produce
+function ElementSpawnEnemyDummy:produce(params, ...)
+	if params and params.name or not self._enemy_mapping then
+		return produce_original(self, params, ...)
+	end
+
+	local original_enemy_name = self._enemy_name
+	if type(self._enemy_mapping) == "table" then
+		self._enemy_name = table.random(self._enemy_mapping)
+	else
+		self._enemy_name = self._enemy_mapping
+	end
+
+	local result = produce_original(self, params, ...)
+
+	self._enemy_name = original_enemy_name
+
+	return result
+end
diff --git a/lua/groupaitweakdata.lua b/lua/groupaitweakdata.lua
index b01fd81..f2f974f 100644
--- a/lua/groupaitweakdata.lua
+++ b/lua/groupaitweakdata.lua
@@ -1929,13 +1929,13 @@ Hooks:PostHook(GroupAITweakData, "_init_task_data", "eclipse__init_task_data", f
 
 	local job = Global.level_data and Global.level_data.level_id
 	local short_ponr_heists = {
-		bph,
-		red2,
-		bex,
-		pex,
-		glace,
-		hox_2,
-		firestarter_2,
+		bph = true,
+		red2 = true,
+		bex = true,
+		pex = true,
+		glace = true,
+		hox_2 = true,
+		firestarter_2 = true,
 	}
 
 	-- Sustain
@@ -1991,7 +1991,7 @@ Hooks:PostHook(GroupAITweakData, "_init_task_data", "eclipse__init_task_data", f
 			fbi_tanks = { 0, 0.02, 0.1 },
 			spoocs = { 0, 0.03, 0.06 },
 		}
-		self.besiege.reenforce.groups = {
+		self.ponr.reenforce.groups = {
 			reenforce_common = { 0.3, 0.3, 0.3 },
 			reenforce_sneaky = { 0, 0.05, 0.1 },
 		}
@@ -2010,7 +2010,7 @@ Hooks:PostHook(GroupAITweakData, "_init_task_data", "eclipse__init_task_data", f
 			gensec_tanks = { 0, 0, 0.1 },
 			spoocs = { 0, 0.045, 0.09 },
 		}
-		self.besiege.reenforce.groups = {
+		self.ponr.reenforce.groups = {
 			reenforce_common = { 0.3, 0.3, 0.3 },
 			reenforce_sneaky = { 0.2, 0.2, 0.2 },
 		}
diff --git a/mod.lua b/mod.lua
index 633fe92..6fa7eaa 100644
--- a/mod.lua
+++ b/mod.lua
@@ -1,21 +1,21 @@
 if not EclipseDebug then
-    EclipseDebug = {}
-    local log_levels = {
-        "Debug",
-        "Warning",
-        "Error"
-    }
-
-    function EclipseDebug:log(level, message)
-        assert(0 < level and level < 4, "Eclipse log level must be between 1-3.")
-        assert(message ~= nil, "Eclipse empty log message.")
-
-        log(string.format("Eclipse %s: %s", log_levels[level], message))
-    end
-
-    function EclipseDebug:log_chat(message)
-        managers.chat:_receive_message(managers.chat.GAME, "Eclipse", message, Color.green)
-    end
+	EclipseDebug = {}
+	local log_levels = {
+		"Debug",
+		"Warning",
+		"Error"
+	}
+
+	function EclipseDebug:log(level, message)
+		assert(0 < level and level < 4, "Eclipse log level must be between 1-3.")
+		assert(message ~= nil, "Eclipse empty log message.")
+
+		log(string.format("Eclipse %s: %s", log_levels[level], message))
+	end
+
+	function EclipseDebug:log_chat(message)
+		managers.chat:_receive_message(managers.chat.GAME, "Eclipse", message, Color.green)
+	end
 end
 
 if not StreamHeist then
diff --git a/req/mission_script/bex.lua b/req/mission_script/bex.lua
index 0265050..554b91b 100644
--- a/req/mission_script/bex.lua
+++ b/req/mission_script/bex.lua
@@ -1,6 +1,6 @@
 return {
-    [101829] = {
-        ponr = 240,
-        ponr_player_mul = {2, 1.5, 1.25, 1}
-    }
-}
\ No newline at end of file
+	[101829] = {
+		ponr = 240,
+		ponr_player_mul = {2, 1.5, 1.25, 1}
+	}
+}
diff --git a/req/mission_script/big.lua b/req/mission_script/big.lua
index aeacce3..f0821bf 100644
--- a/req/mission_script/big.lua
+++ b/req/mission_script/big.lua
@@ -1,8 +1,8 @@
 return {
-    [100809] = {
-        ponr = 180,
-        ponr_player_mul = {2, 1.25, 1, 1}
-    },
+	[100809] = {
+		ponr = 180,
+		ponr_player_mul = {2, 1.25, 1, 1}
+	},
 	[105844] = {
 		reinforce = {
 			{
@@ -17,4 +17,4 @@ return {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mission_script/born.lua b/req/mission_script/born.lua
index 25beaf6..fcf810c 100644
--- a/req/mission_script/born.lua
+++ b/req/mission_script/born.lua
@@ -1,10 +1,10 @@
 return {
-    [100628] = {
+	[100628] = {
 		values = {
 			enabled = false
 		}
-    },
-    [100720] = {
-      set_ponr_state = true
-    }
-}
\ No newline at end of file
+	},
+	[100720] = {
+	  set_ponr_state = true
+	}
+}
diff --git a/req/mission_script/dah.lua b/req/mission_script/dah.lua
index 34b8f2a..467476f 100644
--- a/req/mission_script/dah.lua
+++ b/req/mission_script/dah.lua
@@ -1,10 +1,10 @@
 return {
-    [101967] = {
-        values = {
-            enabled = false
-        }
-    },
-    [100614] = {
-        set_ponr_state = true
-    }
-}
\ No newline at end of file
+	[101967] = {
+		values = {
+			enabled = false
+		}
+	},
+	[100614] = {
+		set_ponr_state = true
+	}
+}
diff --git a/req/mission_script/des.lua b/req/mission_script/des.lua
index c8d0387..556d82f 100644
--- a/req/mission_script/des.lua
+++ b/req/mission_script/des.lua
@@ -15,9 +15,9 @@ return {
 			}
 		}
 	},
-    -- add point of no return
-    [100286] = {
-        ponr = 300,
-        ponr_player_mul = {1.6, 1.2, 1, 0.8}
-    }
-}
\ No newline at end of file
+	-- add point of no return
+	[100286] = {
+		ponr = 300,
+		ponr_player_mul = {1.6, 1.2, 1, 0.8}
+	}
+}
diff --git a/req/mission_script/dinner.lua b/req/mission_script/dinner.lua
index c8e0036..6ff47f9 100644
--- a/req/mission_script/dinner.lua
+++ b/req/mission_script/dinner.lua
@@ -1,11 +1,11 @@
 return {
-    [103218] = {
+	[103218] = {
 		values = {
 			enabled = false
 		}
-    },
-    [101061] = {
-        ponr = 200,
-        ponr_player_mul = {1.5, 1.25, 1, 1}
-    }
-}
\ No newline at end of file
+	},
+	[101061] = {
+		ponr = 200,
+		ponr_player_mul = {1.5, 1.25, 1, 1}
+	}
+}
diff --git a/req/mission_script/firestarter_2.lua b/req/mission_script/firestarter_2.lua
index d113ec5..3be02c1 100644
--- a/req/mission_script/firestarter_2.lua
+++ b/req/mission_script/firestarter_2.lua
@@ -1,6 +1,6 @@
 return {
-    [107196] = {
-        ponr = 60,
-        ponr_player_mul = {2.5, 1.5, 1, 1}
-    }
-}
\ No newline at end of file
+	[107196] = {
+		ponr = 60,
+		ponr_player_mul = {2.5, 1.5, 1, 1}
+	}
+}
diff --git a/req/mission_script/flat.lua b/req/mission_script/flat.lua
index ea86dcc..48c5a88 100644
--- a/req/mission_script/flat.lua
+++ b/req/mission_script/flat.lua
@@ -37,12 +37,12 @@ return {
 		},
 	},
 	-- reenable far sniper
-    [101521] = {
+	[101521] = {
 		values = {
 			enabled = true
 		}
 	},
-    [101599] = {
+	[101599] = {
 		values = {
 			trigger_times = 0,
 			enabled = true
@@ -168,17 +168,17 @@ return {
 		},
 	},
 	-- reenable alleyway drop
-    [102261] = {
-        values = {
-            on_executed = {
-                {delay = 0, id = 101591},
-                {delay = 0, id = 101573},
-                {delay = 0, id = 100350}
-            }
-        }
-    },
-    -- add point of no return
-    [101016] = {
-    ponr = 180
-    }
-}
\ No newline at end of file
+	[102261] = {
+		values = {
+			on_executed = {
+				{delay = 0, id = 101591},
+				{delay = 0, id = 101573},
+				{delay = 0, id = 100350}
+			}
+		}
+	},
+	-- add point of no return
+	[101016] = {
+	ponr = 180
+	}
+}
diff --git a/req/mission_script/hox_1.lua b/req/mission_script/hox_1.lua
index 3a30631..46dba24 100644
--- a/req/mission_script/hox_1.lua
+++ b/req/mission_script/hox_1.lua
@@ -1,12 +1,12 @@
 return {
-    -- add point of no return
-    [100580] = {
-        ponr = 600,
-        ponr_player_mul = {1.8, 1.5, 1.3, 1.2}
-    },
-    [100124] = {
-        values = {
-            difficulty = 0.75
-        }
-    }
-}
\ No newline at end of file
+	-- add point of no return
+	[100580] = {
+		ponr = 600,
+		ponr_player_mul = {1.8, 1.5, 1.3, 1.2}
+	},
+	[100124] = {
+		values = {
+			difficulty = 0.75
+		}
+	}
+}
diff --git a/req/mission_script/hox_2.lua b/req/mission_script/hox_2.lua
index 54790cd..b09556f 100644
--- a/req/mission_script/hox_2.lua
+++ b/req/mission_script/hox_2.lua
@@ -1,6 +1,6 @@
 return {
-    -- add ponr state
-    [104488] = {
-        set_ponr_state = true
-    }
-}
\ No newline at end of file
+	-- add ponr state
+	[104488] = {
+		set_ponr_state = true
+	}
+}
diff --git a/req/mission_script/jolly.lua b/req/mission_script/jolly.lua
index 00a8f3a..24027f9 100644
--- a/req/mission_script/jolly.lua
+++ b/req/mission_script/jolly.lua
@@ -1,7 +1,7 @@
 return {
-    [101598] = {
+	[101598] = {
 		values = {
 			enabled = false
 		}
-    }
-}
\ No newline at end of file
+	}
+}
diff --git a/req/mission_script/man.lua b/req/mission_script/man.lua
index ff7fccf..c53a0f2 100644
--- a/req/mission_script/man.lua
+++ b/req/mission_script/man.lua
@@ -1,8 +1,8 @@
 return {
-    [101433] = {
-        ponr = 60,
-        ponr_player_mul = {1.25, 1, 1, 0.75}
-    },
+	[101433] = {
+		ponr = 60,
+		ponr_player_mul = {1.25, 1, 1, 0.75}
+	},
 	-- Give saw to all players
 	[101865] = {
 		func = function(self)
@@ -44,4 +44,4 @@ return {
 			action_duration_max = 90
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mission_script/mia_2.lua b/req/mission_script/mia_2.lua
index 9259301..780a9aa 100644
--- a/req/mission_script/mia_2.lua
+++ b/req/mission_script/mia_2.lua
@@ -7,14 +7,10 @@ return {
 	[100153] = {
 		difficulty = 1
 	},
-    [101133] = {
-        values = {
-            enemy = "units/payday2/characters/ene_spook_1/ene_spook_1"
-        }
-    },
-    [101141] = {
-        values = {
-            enemy = "units/payday2/characters/ene_spook_1/ene_spook_1"
-        }
-    }
-}
\ No newline at end of file
+	[101133] = {
+		enemy = Idstring("units/payday2/characters/ene_spook_1/ene_spook_1")
+	},
+	[101141] = {
+		enemy = Idstring("units/payday2/characters/ene_spook_1/ene_spook_1")
+	}
+}
diff --git a/req/mission_script/pbr.lua b/req/mission_script/pbr.lua
index c9caa88..e188abe 100644
--- a/req/mission_script/pbr.lua
+++ b/req/mission_script/pbr.lua
@@ -1,10 +1,10 @@
 return {
-    [100119] = {
-        set_ponr_state = true
-    },
-    [101483] = {
-        values = {
-            enabled = false
-        }
-    }
-}
\ No newline at end of file
+	[100119] = {
+		set_ponr_state = true
+	},
+	[101483] = {
+		values = {
+			enabled = false
+		}
+	}
+}
diff --git a/req/mission_script/pbr2.lua b/req/mission_script/pbr2.lua
index 251aac4..f19c475 100644
--- a/req/mission_script/pbr2.lua
+++ b/req/mission_script/pbr2.lua
@@ -1,11 +1,11 @@
 return {
-    [100104] = {
+	[100104] = {
 		values = {
 			enabled = false
 		  }
-    },
-    [100980] = {
-        ponr = 60,
-        ponr_player_mul = {1.67, 1.34, 1, 1}
-    }
-}
\ No newline at end of file
+	},
+	[100980] = {
+		ponr = 60,
+		ponr_player_mul = {1.67, 1.34, 1, 1}
+	}
+}
diff --git a/req/mission_script/peta2.lua b/req/mission_script/peta2.lua
index ea12d04..b14dee7 100644
--- a/req/mission_script/peta2.lua
+++ b/req/mission_script/peta2.lua
@@ -17,12 +17,12 @@ return {
 	},
 	-- add point of no return
 	[100580] = {
-        ponr = 120,
-        ponr_player_mul = {2, 1.25, 1, 1}
+		ponr = 120,
+		ponr_player_mul = {2, 1.25, 1, 1}
 	},
 	[101707] = {
 		values = {
 			enabled = false
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mission_script/pex.lua b/req/mission_script/pex.lua
index f0617a6..dd5a0cb 100644
--- a/req/mission_script/pex.lua
+++ b/req/mission_script/pex.lua
@@ -1,6 +1,6 @@
 return {
-    [101829] = {
-        ponr = 300,
-        ponr_player_mul = {1.5, 1.25, 1, 1}
-    }
-}
\ No newline at end of file
+	[101829] = {
+		ponr = 300,
+		ponr_player_mul = {1.5, 1.25, 1, 1}
+	}
+}
diff --git a/req/mission_script/red2.lua b/req/mission_script/red2.lua
index 646476f..e11f9cb 100644
--- a/req/mission_script/red2.lua
+++ b/req/mission_script/red2.lua
@@ -1,49 +1,41 @@
 return {
-    -- Disable forced manager flee objective
+	-- Disable forced manager flee objective
 	[100665] = {
 		values = {
 			enabled = false
 		}
 	},
-    -- add point of no return
-    [103334] = {
-        ponr = 150,
-        ponr_player_mul = {1.1, 0.9, 0.7, 0.5}
-    },
-    -- remove a few cancer dozers
-    [103603] = {
+	-- add point of no return
+	[103334] = {
+		ponr = 150,
+		ponr_player_mul = {1.1, 0.9, 0.7, 0.5}
+	},
+	-- remove a few cancer dozers
+	[103603] = {
 		values = {
 			enabled = false
 		}
 	},
-    [104132] = {
-        values = {
-            enemy = "units/payday2/characters/ene_spook_1/ene_spook_1"
-        }
-    },
-    [104710] = {
-        values = {
-            enemy = "units/payday2/characters/ene_spook_1/ene_spook_1"
-        }
-    },
-    [104131] = {
-        values = {
-            enemy = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
-        }
-    },
-    [104169] = {
-        values = {
-            enemy = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
-        }
-    },
-    [104000] = {
-        values = {
-            chance = 1
-        }
-    },
-    [100225] = {
-        values = {
-            amount = 5
-        }
-    },
+	[104132] = {
+		enemy = Idstring("units/payday2/characters/ene_spook_1/ene_spook_1")
+	},
+	[104710] = {
+		enemy = Idstring("units/payday2/characters/ene_spook_1/ene_spook_1")
+	},
+	[104131] = {
+		enemy = Idstring("units/payday2/characters/ene_tazer_1/ene_tazer_1")
+	},
+	[104169] = {
+		enemy = Idstring("units/payday2/characters/ene_tazer_1/ene_tazer_1")
+	},
+	[104000] = {
+		values = {
+			chance = 1
+		}
+	},
+	[100225] = {
+		values = {
+			amount = 5
+		}
+	},
 }
diff --git a/req/mission_script/run.lua b/req/mission_script/run.lua
index 2668e07..266602e 100644
--- a/req/mission_script/run.lua
+++ b/req/mission_script/run.lua
@@ -1,58 +1,52 @@
 return {
 	[101356] = {
 		ponr = 480,
-        ponr_player_mul = {2, 1.5, 1.25, 1}
+		ponr_player_mul = {2, 1.5, 1.25, 1}
 	},
-    -- ovk145-alike dozer spawn on armitage avenue
+	-- ovk145-alike dozer spawn on armitage avenue
 	[103593] = {
 		values = {
 			chance = 100
 		}
 	},
-    [100232] = {
-        values = {
-            enemy = "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
-        }
-    },
-    [100341] = {
-        values = {
-            enemy = "units/payday2/characters/ene_bulldozer_2/ene_bulldozer_2"
-        }
-    },
-    [100351] = {
-        values = {
-            enemy = "units/payday2/characters/ene_bulldozer_3/ene_bulldozer_3"
-        }
-    },
-    [101202] = {
-        values = {
-            on_executed = {
-                {delay = 5, id = 100232},
-                {delay = 5, id = 100341},
-                {delay = 5, id = 100351},
-                {delay = 0, id = 101669},
-                {delay = 15, id = 101648},
-            }
-        }
-    },
-    -- add missing sniper
-    [103582] = {
-        values = {
-            difficulty_overkill_145 = true,
-            difficulty_easy_wish = true
-        }
-    },
-    [102866] = {
+	[100232] = {
+		enemy = Idstring("units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1")
+	},
+	[100341] = {
+		enemy = Idstring("units/payday2/characters/ene_bulldozer_2/ene_bulldozer_2")
+	},
+	[100351] = {
+		enemy = Idstring("units/payday2/characters/ene_bulldozer_3/ene_bulldozer_3")
+	},
+	[101202] = {
+		values = {
+			on_executed = {
+				{delay = 5, id = 100232},
+				{delay = 5, id = 100341},
+				{delay = 5, id = 100351},
+				{delay = 0, id = 101669},
+				{delay = 15, id = 101648},
+			}
+		}
+	},
+	-- add missing sniper
+	[103582] = {
+		values = {
+			difficulty_overkill_145 = true,
+			difficulty_easy_wish = true
+		}
+	},
+	[102866] = {
 		values = {
 			enabled = false
 		}
 	},
-    [102880] = {
+	[102880] = {
 		values = {
 			enabled = false
 		}
 	},
-    [100029] = {
+	[100029] = {
 		values = {
 			interval = 20
 		}
@@ -67,4 +61,4 @@ return {
 			interval = 20
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mission_script/rvd1.lua b/req/mission_script/rvd1.lua
index e6ab1a8..f75d252 100644
--- a/req/mission_script/rvd1.lua
+++ b/req/mission_script/rvd1.lua
@@ -1,6 +1,6 @@
 return {
-    [100115] = {
-        ponr = 900,
-        ponr_player_mul = {2, 1.25, 1, 1}
-    }
-}
\ No newline at end of file
+	[100115] = {
+		ponr = 900,
+		ponr_player_mul = {2, 1.25, 1, 1}
+	}
+}
diff --git a/req/mission_script/rvd2.lua b/req/mission_script/rvd2.lua
index c8d5926..f661c44 100644
--- a/req/mission_script/rvd2.lua
+++ b/req/mission_script/rvd2.lua
@@ -1,27 +1,21 @@
 return {
 	-- Replace dozer spam with less stupid enemies
 	[101565] = {
-		values = {
-            enemy = "units/payday2/characters/ene_spook_1/ene_spook_1"
-		}
+		enemy = Idstring("units/payday2/characters/ene_spook_1/ene_spook_1")
 	},
 	[101176] = {
-		values = {
-            enemy = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
-		}
+		enemy = Idstring("units/payday2/characters/ene_tazer_1/ene_tazer_1")
 	},
 	[101207] = {
-		values = {
-            enemy = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
-		}
+		enemy = Idstring("units/payday2/characters/ene_tazer_1/ene_tazer_1")
 	},
 	[102176] = {
 		values = {
-            enabled = false
+			enabled = false
 		}
 	},
 	-- instantly enter point of no return upon securing all bags
-    [100884] = {
+	[100884] = {
 		set_ponr_state = true
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mission_script/spa.lua b/req/mission_script/spa.lua
index b1753cf..c98c26c 100644
--- a/req/mission_script/spa.lua
+++ b/req/mission_script/spa.lua
@@ -1,14 +1,14 @@
 return {
-    -- add point of no return and disable endless assault
-    [100875] = {
-        ponr = 240,
-        ponr_player_mul = {1.5, 1, 0.85, 0.75}
-    },
-    [100877] = {
-        values = {
+	-- add point of no return and disable endless assault
+	[100875] = {
+		ponr = 240,
+		ponr_player_mul = {1.5, 1, 0.85, 0.75}
+	},
+	[100877] = {
+		values = {
 			enabled = false
-        }
-    },
+		}
+	},
 	-- Slow down window spawns
 	[100750] = {
 		values = {
diff --git a/req/mission_script/trai.lua b/req/mission_script/trai.lua
index 52bd7be..5b9576f 100644
--- a/req/mission_script/trai.lua
+++ b/req/mission_script/trai.lua
@@ -1,12 +1,12 @@
 return {
-    [103501] = {
-        values = {
-            enabled = false
-        }
-    },
-    [103051] = {
-        values = {
-            enabled = false
-        }
-    }
-}
\ No newline at end of file
+	[103501] = {
+		values = {
+			enabled = false
+		}
+	},
+	[103051] = {
+		values = {
+			enabled = false
+		}
+	}
+}
diff --git a/req/mission_script/vit.lua b/req/mission_script/vit.lua
index 6a8fb4a..28a4c21 100644
--- a/req/mission_script/vit.lua
+++ b/req/mission_script/vit.lua
@@ -12,7 +12,7 @@ return {
 	},
 	[100022] = {
 		ponr = 1500,
-        ponr_player_mul = {3.5, 2.5, 2.25, 2}
+		ponr_player_mul = {3.5, 2.5, 2.25, 2}
 	},
 	[103360] = {
 		values = {
@@ -24,4 +24,4 @@ return {
 			enabled = false
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mission_script/wwh.lua b/req/mission_script/wwh.lua
index 652e7ed..09013ef 100644
--- a/req/mission_script/wwh.lua
+++ b/req/mission_script/wwh.lua
@@ -1,11 +1,11 @@
 return {
-    [100361] = {
+	[100361] = {
 		values = {
 			enabled = false
 		}
 	},
-    [100945] = {
+	[100945] = {
 		ponr = 900,
 		ponr_player_mul = {2, 1.25, 1, 0.8}
 	}
-}
\ No newline at end of file
+}
diff --git a/req/mod_conflicts.lua b/req/mod_conflicts.lua
index f1aa62e..c1ca1f7 100644
--- a/req/mod_conflicts.lua
+++ b/req/mod_conflicts.lua
@@ -17,10 +17,10 @@ return table.list_to_set({
 	"Hyper Heisting",
 	"Skill Overhaul",
 	"No Leech",
-    "Hinaomi's Rebalance - Weapons",
-    "Hinaomi's Rebalance - Skills & Perk Decks",
-    "Hinaomi's Rebalance - Weapon Conversion Kits",
-    "Better Bots",
+	"Hinaomi's Rebalance - Weapons",
+	"Hinaomi's Rebalance - Skills & Perk Decks",
+	"Hinaomi's Rebalance - Weapon Conversion Kits",
+	"Better Bots",
 	"Melee Overhaul ME: Melee Sprinting",
 	"Melee Overhaul ME: Sprint Hold",
 	"Melee Overhaul ME: Melee Decapitations",
diff --git a/req/unit_weapons.lua b/req/unit_weapons.lua
index 2b7660a..3e9b50e 100644
--- a/req/unit_weapons.lua
+++ b/req/unit_weapons.lua
@@ -2,10 +2,10 @@ return {
 	[("units/payday2/characters/ene_cop_3/ene_cop_3"):key()] = "r870",
 	[("units/payday2/characters/ene_cop_4/ene_cop_4"):key()] = "mp5",
 	[("units/payday2/characters/ene_fbi_3/ene_fbi_3"):key()] = "r870",
-    [("units/payday2/characters/ene_medic_m4/ene_medic_m4"):key()] = "mp5",
-    [("units/payday2/characters/ene_spook_1/ene_spook_1"):key()] = "beretta92",
+	[("units/payday2/characters/ene_medic_m4/ene_medic_m4"):key()] = "mp5",
+	[("units/payday2/characters/ene_spook_1/ene_spook_1"):key()] = "beretta92",
 	[("units/payday2/characters/ene_biker_3/ene_biker_3"):key()] = "mossberg",
 	[("units/pd2_dlc_born/characters/ene_biker_female_3/ene_biker_female_3"):key()] = "mossberg",
-    [("units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic"):key()] = "benelli",
-    [("units/pd2_dlc_drm/characters/ene_bulldozer_minigun/ene_bulldozer_minigun"):key()] = "benelli",
-}
\ No newline at end of file
+	[("units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic"):key()] = "benelli",
+	[("units/pd2_dlc_drm/characters/ene_bulldozer_minigun/ene_bulldozer_minigun"):key()] = "benelli",
+}