diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
index 4280d5a5..a4f7a403 100644
--- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
+++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
@@ -364,24 +364,20 @@ if !(_playerTempKey isEqualTo "EPOCH_playerTemp") then {
 };
 
 // Check for PlayerMarker and Update or Remove it
-_config = 'CfgMarkerSets' call EPOCH_returnConfig;
-_markerArray = getArray(_config >> 'PlayerMarker' >> 'markerArray');
-_markerName = (_markerArray select 0) select 0;
-
-if(_markerName in allMapMarkers)then{
+if(_PlayerMarkerName in allMapMarkers)then{
 	if!('ItemGPS' in (assignedItems player))then{
 		['PlayerMarker'] call EPOCH_fnc_deleteLocalMarkerSet;
-		if(((getArray(_config >> 'DeathMarker' >> 'markerArray') select 0) select 0) in allMapMarkers)then{
+		if(_DeathMarkerName in allMapMarkers)then{
 			['DeathMarker'] call EPOCH_fnc_deleteLocalMarkerSet;
 		};
 	}else{
 		{
 			(_x select 0) setMarkerPosLocal (position player);
 			if(count(_x) >= 8)then{(_x select 0) setMarkerTextLocal (call compile (_x select 7))};
-		}forEach _markerArray;
+		}forEach _PlayerMarkerArray;
 	};
 };
-if(getNumber(('CfgEpochClient' call EPOCH_returnConfig) >> 'mapOnZoomSetMarkerSize') isEqualTo 1)then{
+if(_mapOnZoomSetMarkerSize isEqualTo 1)then{
 	if(visibleMap)then{
 		_mapScale = ctrlMapScale ((findDisplay 12) displayCtrl 51);
 		_mapMarkers = allMapMarkers;
diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
index 08279410..49552d17 100644
--- a/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
+++ b/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
@@ -53,7 +53,7 @@ if (_playerRadiation > _radiationEffectsThreshold) then {
 
 // Geiger Deplete Energy
 if (EPOCH_geiger_shown) then {
-	_energyValue = _energyValue - (["CfgEpochClient", "outOfBoundsRadiation", 10] call EPOCH_fnc_returnConfigEntryV2);
+	_energyValue = _energyValue - _outOfBoundsRadiation;
 };
 
 //  Energy Handler
diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf
index 8a0d69ea..3c0ebad8 100644
--- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf
+++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf
@@ -132,6 +132,10 @@ _energyRange = ["CfgEpochClient", "energyRange", 75] call EPOCH_fnc_returnConfig
 _hudConfigs = ["CfgEpochClient", "hudConfigs", []] call EPOCH_fnc_returnConfigEntryV2;
 _radioactiveLocations = ["CfgEpochClient", "radioactiveLocations", ["NameCityCapital", "NameCity", "Airport"]] call EPOCH_fnc_returnConfigEntryV2;
 _radiatedObjMaxRange = ["CfgEpochClient", "radiatedObjMaxFalloutDist", 75] call EPOCH_fnc_returnConfigEntryV2;
+_PlayerMarkerArray = getArray(('CfgMarkerSets' call EPOCH_returnConfig) >> 'PlayerMarker' >> 'markerArray');
+_PlayerMarkerName = (_PlayerMarkerArray param [0,[]]) param [0,"EPOCH_PlayerMarker1"];
+_DeathMarkerName = ((getArray (('CfgMarkerSets' call EPOCH_returnConfig) >> 'DeathMarker' >> 'markerArray')) param [0,[]]) param [0,"EPOCH_DeathMarker1"];
+_mapOnZoomSetMarkerSize = ["CfgEpochClient", "mapOnZoomSetMarkerSize", 0] call EPOCH_fnc_returnConfigEntryV2;
 
 _chargeRate = 0;