diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 931c806..f7a9d90 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -200,13 +200,15 @@ if settings.startup['PHI-MI'].value then
     end
 
     if settings.startup['PHI-MI-PIPE'].value then
-        local s = settings.startup['PHI-MI-PIPE'].value
+        local s = (1 + settings.startup['PHI-MI-ROBOT'].value) / 2
 
         for _, t in pairs({data.raw['offshore-pump'], data.raw['pump']}) do
             for _, v in pairs(t) do
                 v.pumping_speed = v.pumping_speed * s
             end
         end
+
+        data.raw['utility-constants'].default.max_fluid_flow = 100 * s
     end
 
     if settings.startup['PHI-MI-ROBOT'].value then
@@ -1148,9 +1150,9 @@ if settings.startup['PHI-SA'].value then
     end
 
     if settings.startup['PHI-SA-HEAT-RADIUS'].value and mods['space-age'] then
-        for k, _ in pairs({'heat-pipe', 'reactor'}) do
-            for _, v in pairs(data.raw[k]) do
-                v.heating_radius = settings.startup['PHI-SA-HEAT-RADIUS'].value
+        for _, v in pairs({data.raw['heat-pipe'], data.raw['heat-pipe']}) do
+            for _, v2 in pairs(v) do
+                v2.heating_radius = settings.startup['PHI-SA-HEAT-RADIUS'].value
             end
         end
     end
diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg
index 9772458..df23fdf 100644
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -129,10 +129,10 @@ PHI-SA-HEAT-RADIUS=[color=54,228,255]SA1[/color]
 PHI-SA-SPOIL=[color=54,228,255]SA2[/color]
 PHI-SA-SPOIL-FREEZE=[color=54,228,255]SA3[/color]
 PHI-SA-SPOIL-FREEZE-RATIO=[color=54,228,255]SA4[/color]
-PHI-SA-RESTRICTION=[color=54,228,255]SA5[/color]
-PHI-SA-GENERIC=[color=54,228,255]SA6[/color]
-PHI-SA-QUALITY=[color=54,228,255]SA7[/color]
-PHI-SA-NO-QUALITY=[color=54,228,255]SA8[/color]
+PHI-SA-QUALITY=[color=54,228,255]SA5[/color]
+PHI-SA-NO-QUALITY=[color=54,228,255]SA6[/color]
+PHI-SA-RESTRICTION=[color=54,228,255]SA7[/color]
+PHI-SA-GENERIC=[color=54,228,255]SA8[/color]
 PHI-SA-VANILLA=[color=54,228,255]SA9[/color]
 
 PHI-CT=[color=255,254,42]CT[/color]
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index cfaadf4..9be4154 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -207,7 +207,7 @@ data:extend({
   default_value = 10,
   minimum_value = 1,
   maximum_value = 10000,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-SA-ROCKET-CAPACITY'}},
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-MI-ROCKET-CAPACITY'}},
   order = 'C09'
 }, {
   type = 'int-setting',
@@ -216,7 +216,7 @@ data:extend({
   default_value = 100,
   minimum_value = 1,
   maximum_value = 1000,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-CARGO-WEIGHT'}, {'mod-setting-name.PHI-SA-CARGO-WEIGHT'}},
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-CARGO-WEIGHT'}, {'mod-setting-name.PHI-MI-CARGO-WEIGHT'}},
   order = 'C10'
 }, {
   type = 'bool-setting',
@@ -256,20 +256,6 @@ data:extend({
   maximum_value = 1000,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE-RATIO'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE-RATIO'}},
   order = 'D04'
-}, {
-  type = 'bool-setting',
-  name = 'PHI-SA-RESTRICTION',
-  setting_type = 'startup',
-  default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-RESTRICTION'}, {'mod-setting-name.PHI-SA-RESTRICTION'}},
-  order = 'D05'
-}, {
-  type = 'bool-setting',
-  name = 'PHI-SA-GENERIC',
-  setting_type = 'startup',
-  default_value = true,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-GENERIC'}, {'mod-setting-name.PHI-SA-GENERIC'}},
-  order = 'D06'
 }, {
   type = 'int-setting',
   name = 'PHI-SA-QUALITY',
@@ -278,13 +264,27 @@ data:extend({
   minimum_value = 1,
   maximum_value = 100,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-QUALITY'}, {'mod-setting-name.PHI-SA-QUALITY'}},
-  order = 'D07'
+  order = 'D05'
 }, {
   type = 'bool-setting',
   name = 'PHI-SA-NO-QUALITY',
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-NO-QUALITY'}, {'mod-setting-name.PHI-SA-NO-QUALITY'}},
+  order = 'D06'
+}, {
+  type = 'bool-setting',
+  name = 'PHI-SA-RESTRICTION',
+  setting_type = 'startup',
+  default_value = false,
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-RESTRICTION'}, {'mod-setting-name.PHI-SA-RESTRICTION'}},
+  order = 'D07'
+}, {
+  type = 'bool-setting',
+  name = 'PHI-SA-GENERIC',
+  setting_type = 'startup',
+  default_value = true,
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-GENERIC'}, {'mod-setting-name.PHI-SA-GENERIC'}},
   order = 'D08'
 }, {
   type = 'bool-setting',