diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua
index e1e34a0..d316506 100644
--- a/PHI-CL/config.lua
+++ b/PHI-CL/config.lua
@@ -1269,23 +1269,17 @@ if mods then
             max = settings.startup['PHI-MB-LAB-TIER'].value
         }
 
-        items['equipment']['solar-panel-equipment'].base = 30
-
         items['equipment']['fusion-reactor-equipment'].tech = 'se-rtg-equipment'
         items['equipment']['fusion-reactor-equipment'].base_name = 'se-rtg'
-        items['equipment']['fusion-reactor-equipment'].base = 400
 
         items['equipment']['battery-equipment'].tech = 'battery-equipment'
         items['equipment']['battery-equipment'].min = 2
-        items['equipment']['battery-equipment'].base = 100
 
         items['equipment']['energy-shield-equipment'].tech = 'energy-shield-equipment'
         items['equipment']['energy-shield-equipment'].min = 2
-        items['equipment']['energy-shield-equipment'].base = 200
 
         items['equipment']['personal-roboport-equipment'].tech = 'personal-roboport-equipment'
         items['equipment']['personal-roboport-equipment'].min = 2
-        items['equipment']['personal-roboport-equipment'].base = 0.5
     end
 end
 
diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua
index 410bc7e..2f44441 100644
--- a/PHI-CL/data-updates.lua
+++ b/PHI-CL/data-updates.lua
@@ -274,30 +274,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-LOADER'].value
     data.raw.recipe['fast-loader'].hidden = false
     data.raw.recipe['express-loader'].hidden = false
 
-    --[[
-    data.raw.recipe['loader'].ingredients = {
-        {'iron-plate', 5},
-        {'electronic-circuit', 5},
-        {'transport-belt', 2},
-        {'inserter', 2}
-    }
-    data.raw.recipe['fast-loader'].ingredients = {
-        {'iron-gear-wheel', 10},
-        {'electronic-circuit', 10},
-        {'advanced-circuit', 1},
-        {'loader', 1}
-    }
-
-    data.raw.recipe['express-loader'].ingredients = {
-        {'iron-gear-wheel', 10},
-        {'advanced-circuit', 10},
-        {'fast-loader', 1}
-    }
-
     table.insert(data.raw.technology['logistics'].effects, {type='unlock-recipe', recipe='loader'})
     table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'})
     table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'})
-    ]]
 end
 
 if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RECIPE'].value then
@@ -803,8 +782,12 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
         {
             type = 'armor',
             name = 'power-armor-mk3',
-            icon = '__base__/graphics/icons/power-armor-mk2.png',
-            icon_size = 64, icon_mipmaps = 4,
+            icons = {
+                icon = '__base__/graphics/icons/power-armor-mk2.png',
+                tint = items['tint'][2],
+                icon_size = 64,
+                icon_mipmaps = 4
+            },
             resistances = {
                 {
                     type = 'physical',
diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua
index 4cd2415..1f8711f 100644
--- a/PHI-CL/main.lua
+++ b/PHI-CL/main.lua
@@ -318,33 +318,33 @@ function main.EEQ(source, tier)
             if item.attack_parameters.ammo_type.action_delivery then
 
                 if item.attack_parameters.ammo_type.action_delivery then
-                    item.attack_parameters.ammo_type.action_delivery.max_length = item.attack_parameters.ammo_type.action_delivery.max_length + tier
+                    item.attack_parameters.ammo_type.action_delivery.max_length = item.attack_parameters.ammo_type.action_delivery.max_length + tier - 1
                 end
             end
         end
 
         if item.attack_parameters.range then
-            item.attack_parameters.range = item.attack_parameters.range + tier
+            item.attack_parameters.range = item.attack_parameters.range + tier - 1
         end
 
-    elseif item.max_shield_value then
+    elseif item.max_shield_value and item.energy_per_shield then
         item.max_shield_value = item.max_shield_value * (2 ^ (tier - source.min + 1))
+        item.energy_per_shield = math.floor(item.energy_per_shield * ((32 - tier) / 32))
 
     elseif item.movement_bonus then
         item.movement_bonus = item.movement_bonus * (2 ^ (tier - source.min + 1))
 
-    elseif item.charging_energy then
+    elseif item.charging_energy and item.charging_station_count then
         item.charging_energy = tostring(tonumber(string.match(item.charging_energy, '[%d%.]+')) * (2 ^ (tier - source.min + 1))) .. string.match(item.charging_energy, '%a+')
-
-        if item.charging_station_count then
-            item.charging_station_count = math.max(item.charging_station_count, 16)
-        end
+        item.charging_station_count = math.max(item.charging_station_count, 8)
     end
 
-    item.sprite.tint = items['tint'][tier]
+    if item.sprite then
+        item.sprite.tint = items['tint'][tier]
 
-    if item.sprite.hr_version then
-        item.sprite.hr_version.tint = items['tint'][tier]
+        if item.sprite.hr_version then
+            item.sprite.hr_version.tint = items['tint'][tier]
+        end
     end
 
     item.localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tier}