diff --git a/PHI-CL/data/b/mbm-c.lua b/PHI-CL/data/b/mbm-c.lua
index 2e128fa..e4d09ef 100644
--- a/PHI-CL/data/b/mbm-c.lua
+++ b/PHI-CL/data/b/mbm-c.lua
@@ -12,181 +12,157 @@ return {
     ['electric-furnace'] = {
         type = 'furnace',
         name = 'electric-furnace',
-        tech = 'advanced-material-processing-2',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'advanced-material-processing-2'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['oil-refinery'] = {
         type = 'assembling-machine',
         name = 'oil-refinery',
-        tech = 'oil-processing',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'oil-processing'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['chemical-plant'] = {
         type = 'assembling-machine',
         name = 'chemical-plant',
-        tech = 'oil-processing',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'oil-processing'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['centrifuge'] = {
         type = 'assembling-machine',
         name = 'centrifuge',
-        tech = 'uranium-processing',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'uranium-processing'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['lab'] = {
         type = 'lab',
         name = 'lab',
-        tech = 'automation',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'automation'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['electric-mining-drill'] = {
         type = 'mining-drill',
         name = 'electric-mining-drill',
-        tech = 'automation',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'automation'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['pumpjack'] = {
         type = 'mining-drill',
         name = 'pumpjack',
-        tech = 'automation',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'automation'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['laser-turret'] = {
         type = 'electric-turret',
         name = 'laser-turret',
-        tech = 'laser-turret',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'laser-turret'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['flamethrower-turret'] = {
         type = 'fluid-turret',
         name = 'flamethrower-turret',
-        tech = 'flamethrower',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'flamethrower'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['gun-turret'] = {
         type = 'ammo-turret',
         name = 'gun-turret',
-        tech = 'gun-turret',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'gun-turret'
     },
     -- MBM A 2 BASE ENTITY,RECIPE,RESEARCH_EFFECT
     ['radar'] = {
         type = 'radar',
         name = 'radar',
-        tech = 'automation',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'automation'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['railgun-turret'] = {
         mod = 'space-age',
         type = 'ammo-turret',
         name = 'railgun-turret',
-        tech = 'railgun',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'railgun'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['rocket-turret'] = {
         mod = 'space-age',
         type = 'ammo-turret',
         name = 'rocket-turret',
-        tech = 'rocket-turret',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'rocket-turret'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['tesla-turret'] = {
         mod = 'space-age',
         type = 'electric-turret',
         name = 'tesla-turret',
-        tech = 'tesla-weapons',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'tesla-weapons'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['foundry'] = {
         mod = 'space-age',
         type = 'assembling-machine',
         name = 'foundry',
-        tech = 'foundry',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'foundry'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['big-mining-drill'] = {
         mod = 'space-age',
         type = 'mining-drill',
         name = 'big-mining-drill',
-        tech = 'big-mining-drill',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'big-mining-drill'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['biochamber'] = {
         mod = 'space-age',
         type = 'assembling-machine',
         name = 'biochamber',
-        tech = 'biochamber',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'biochamber'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['crusher'] = {
         mod = 'space-age',
         type = 'assembling-machine',
         name = 'crusher',
-        tech = 'space-platform',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'space-platform'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['biolab'] = {
         mod = 'space-age',
         type = 'lab',
         name = 'biolab',
-        tech = 'biolab',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'biolab'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['cryogenic-plant'] = {
         mod = 'space-age',
         type = 'assembling-machine',
         name = 'cryogenic-plant',
-        tech = 'cryogenic-plant',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'cryogenic-plant'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['electromagnetic-plant'] = {
         mod = 'space-age',
         type = 'assembling-machine',
         name = 'electromagnetic-plant',
-        tech = 'electromagnetic-plant',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'electromagnetic-plant'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['thruster'] = {
         mod = 'space-age',
         type = 'thruster',
         name = 'thruster',
-        tech = 'space-platform-thruster',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'space-platform-thruster'
     },
     -- MBE A 2 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
     ['agricultural-tower'] = {
         mod = 'space-age',
         type = 'agricultural-tower',
         name = 'agricultural-tower',
-        tech = 'agriculture',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'agriculture'
     },
     -- MBE A 2 RECYCLER ENTITY,RECIPE,RESEARCH_EFFECT
     ['recycler'] = {
         mod = 'recycler',
         type = 'furnace',
         name = 'recycler',
-        tech = 'agriculture',
-        max = settings.startup['PHI-MB-MACHINE'].value
+        tech = 'agriculture'
     },
 }
diff --git a/PHI-CL/data/b/mbm.lua b/PHI-CL/data/b/mbm.lua
index 156aa75..9caa9f2 100644
--- a/PHI-CL/data/b/mbm.lua
+++ b/PHI-CL/data/b/mbm.lua
@@ -416,6 +416,7 @@ end
 for _, v in pairs(items) do
     v.mod = v.mod or 'base'
     v.min = v.min or 2
+    v.max = v.max or settings.startup['PHI-MB-MACHINE'].value
     v.ref_name = v.ref_name or v.name
 
     if (v.mod and mods[v.mod]) and (v.max >= v.min) and data.raw[v.type] and data.raw[v.type][v.ref_name] and not data.raw[v.type][v.ref_name].hidden then
diff --git a/PHI-CL/data/b/mbq-c.lua b/PHI-CL/data/b/mbq-c.lua
index 69e7558..62d82f0 100644
--- a/PHI-CL/data/b/mbq-c.lua
+++ b/PHI-CL/data/b/mbq-c.lua
@@ -12,8 +12,7 @@ return {
     ['discharge-defense-equipment'] = {
         type = 'active-defense-equipment',
         name = 'discharge-defense',
-        tech = 'discharge-defense-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value
+        tech = 'discharge-defense-equipment'
     },
     -- MBQ A 2 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
     ['energy-shield-equipment'] = {
@@ -28,16 +27,14 @@ return {
     ['exoskeleton-equipment'] = {
         type = 'movement-bonus-equipment',
         name = 'exoskeleton',
-        tech = 'exoskeleton-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value or 1
+        tech = 'exoskeleton-equipment'
     },
     -- MBQ A 2 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
     ['fission-reactor-equipment'] = {
         type = 'generator-equipment',
         name = 'fission-reactor',
         ref_name = 'fission-reactor-equipment',
-        tech = 'fission-reactor-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value or 1
+        tech = 'fission-reactor-equipment'
     },
     -- MBQ A 1 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
     ['night-vision-equipment'] = {
@@ -50,8 +47,7 @@ return {
     ['personal-laser-defense-equipment'] = {
         type = 'active-defense-equipment',
         name = 'personal-laser-defense',
-        tech = 'personal-laser-defense-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value
+        tech = 'personal-laser-defense-equipment'
     },
     -- MBQ A 2 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
     ['personal-roboport-equipment'] = {
@@ -67,24 +63,20 @@ return {
         type = 'solar-panel-equipment',
         name = 'solar-panel',
         tech = 'solar-panel-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value,
         base = 30,
-        graphics_name = 'solar-panel-equipment'
     },
     -- MBQ A 2 SPACE_AGE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
     ['fusion-reactor-equipment'] = {
         mod = 'space-age',
         type = 'generator-equipment',
         name = 'fusion-reactor',
-        tech = 'fusion-reactor-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value
+        tech = 'fusion-reactor-equipment'
     },
     -- MBQ A 2 SPACE_AGE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
     ['toolbelt-equipment'] = {
         mod = 'space-age',
         type = 'inventory-bonus-equipment',
         name = 'toolbelt',
-        tech = 'toolbelt-equipment',
-        max = settings.startup['PHI-MB-EQUIPMENT'].value
+        tech = 'toolbelt-equipment'
     }
 }
diff --git a/PHI-CL/data/b/mbq.lua b/PHI-CL/data/b/mbq.lua
index d50a4b4..4df2f81 100644
--- a/PHI-CL/data/b/mbq.lua
+++ b/PHI-CL/data/b/mbq.lua
@@ -211,6 +211,7 @@ end
 for _, v in pairs(items) do
     v.mod = v.mod or 'base'
     v.min = v.min or 2
+    v.max = v.max or settings.startup['PHI-MB-EQUIPMENT'].value
     v.ref_name = v.ref_name or v.name .. '-equipment'
 
     if (v.mod and mods[v.mod]) and (v.max >= v.min) and data.raw[v.type] and data.raw[v.type][v.ref_name] and not data.raw[v.type][v.ref_name].hidden then