diff --git a/doc/_static/custom_math/annual_energy_balance.yaml b/doc/_static/custom_math/annual_energy_balance.yaml
index 6001dd0d8..d1b957131 100644
--- a/doc/_static/custom_math/annual_energy_balance.yaml
+++ b/doc/_static/custom_math/annual_energy_balance.yaml
@@ -5,8 +5,8 @@
 # annual_source_max
 
 # New top-level parameters:
-# annual_flow_max (if grouping technologies and/or nodes)
-# flow_max_group (if grouping technologies and/or nodes)
+# annual_flow_max (if summing over technologies and/or nodes)
+# flow_max_group (if summing over technologies and/or nodes)
 
 constraints:
   annual_energy_balance_per_tech_and_node:
diff --git a/doc/_static/custom_math/demand_share_per_timestep_decision.yaml b/doc/_static/custom_math/demand_share_per_timestep_decision.yaml
index 26ea25304..7b0fe9b2f 100644
--- a/doc/_static/custom_math/demand_share_per_timestep_decision.yaml
+++ b/doc/_static/custom_math/demand_share_per_timestep_decision.yaml
@@ -8,8 +8,9 @@
 # Specifying `relaxation` inside the constraint to a non-zero value allows the constraint some flexibility around a given value, making a model easier to solve.
 
 # New top-level parameters:
-# relaxation (defined here directly)
-# total share limit (defined here directly)
+# relaxation (defined here directly).
+# demand_share_limit.
+# decide_demand_share <- Link supply technologies to the demand technology they are going to be a share of.
 
 variables:
   demand_share_per_timestep_decision:
diff --git a/doc/_static/custom_math/fuel_dist.yaml b/doc/_static/custom_math/fuel_dist.yaml
index 889f405ca..c2bbf0e4d 100644
--- a/doc/_static/custom_math/fuel_dist.yaml
+++ b/doc/_static/custom_math/fuel_dist.yaml
@@ -8,6 +8,7 @@
 # fuel_export_max
 # fuel_distribution_max
 # fuel_distributor_costs
+# allow_fuel_distribution <- lookup array with a value of `True` for each carrier where you want to track its distribution
 
 variables:
   fuel_distributor:
diff --git a/src/calliope/math/base.yaml b/src/calliope/math/base.yaml
index d2ffe8089..b99c1c10a 100644
--- a/src/calliope/math/base.yaml
+++ b/src/calliope/math/base.yaml
@@ -546,7 +546,7 @@ variables:
       max: storage_cap_max
 
   storage:
-    description: "The carrier stored by a `supply_plus` or `storage` technology in each timestep."
+    description: "The carrier stored by a `storage` technology in each timestep."
     unit: energy
     foreach: [nodes, techs, timesteps]
     where: "include_storage=True"
diff --git a/tests/common/lp_files/piecewise_efficiency_2.lp b/tests/common/lp_files/piecewise_efficiency_2.lp
deleted file mode 100644
index bbc8dabf4..000000000
--- a/tests/common/lp_files/piecewise_efficiency_2.lp
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-   0 <= variables(available_flow_cap)(a__test_conversion__2005_01_01_00_00) <= 15.0
-   0 <= variables(available_flow_cap)(a__test_conversion__2005_01_01_01_00) <= 15.0
-   0 <= variables(flow_cap)(a__test_conversion) <= 15.0
-   0 <= variables(flow_in)(a__test_conversion__gas__2005_01_01_00_00) <= +inf
-   0 <= variables(flow_in)(a__test_conversion__gas__2005_01_01_01_00) <= +inf
-   0 <= variables(flow_out)(a__test_conversion__heat__2005_01_01_00_00) <= +inf
-   0 <= variables(flow_out)(a__test_conversion__heat__2005_01_01_01_00) <= +inf
-   0 <= variables(operating_units)(a__test_conversion__2005_01_01_00_00) <= +inf
-   0 <= variables(operating_units)(a__test_conversion__2005_01_01_01_00) <= +inf
-   1 <= ONE_VAR_CONSTANT <= 1
-  variables(operating_units)(a__test_conversion__2005_01_01_00_00)
-  variables(operating_units)(a__test_conversion__2005_01_01_01_00)
-+1 variables(available_flow_cap)(a__test_conversion__2005_01_01_00_00)
-+1 variables(available_flow_cap)(a__test_conversion__2005_01_01_00_00)
-+1 variables(available_flow_cap)(a__test_conversion__2005_01_01_01_00)
-+1 variables(available_flow_cap)(a__test_conversion__2005_01_01_01_00)
-+1 variables(flow_cap)(a__test_conversion)
-+1 variables(flow_cap)(a__test_conversion)
-+14 variables(flow_out)(a__test_conversion__heat__2005_01_01_00_00)
-+14 variables(flow_out)(a__test_conversion__heat__2005_01_01_01_00)
-+15.0 variables(operating_units)(a__test_conversion__2005_01_01_00_00)
-+15.0 variables(operating_units)(a__test_conversion__2005_01_01_01_00)
-+2.0 ONE_VAR_CONSTANT
-+5 variables(flow_out)(a__test_conversion__heat__2005_01_01_00_00)
-+5 variables(flow_out)(a__test_conversion__heat__2005_01_01_01_00)
-+7 variables(flow_out)(a__test_conversion__heat__2005_01_01_00_00)
-+7 variables(flow_out)(a__test_conversion__heat__2005_01_01_01_00)
--1 variables(available_flow_cap)(a__test_conversion__2005_01_01_00_00)
--1 variables(available_flow_cap)(a__test_conversion__2005_01_01_01_00)
--1 variables(flow_cap)(a__test_conversion)
--1 variables(flow_cap)(a__test_conversion)
--1 variables(flow_in)(a__test_conversion__gas__2005_01_01_00_00)
--1 variables(flow_in)(a__test_conversion__gas__2005_01_01_00_00)
--1 variables(flow_in)(a__test_conversion__gas__2005_01_01_00_00)
--1 variables(flow_in)(a__test_conversion__gas__2005_01_01_01_00)
--1 variables(flow_in)(a__test_conversion__gas__2005_01_01_01_00)
--1 variables(flow_in)(a__test_conversion__gas__2005_01_01_01_00)
--15.0 variables(operating_units)(a__test_conversion__2005_01_01_00_00)
--15.0 variables(operating_units)(a__test_conversion__2005_01_01_01_00)
--16 variables(available_flow_cap)(a__test_conversion__2005_01_01_00_00)
--16 variables(available_flow_cap)(a__test_conversion__2005_01_01_01_00)
--2 variables(available_flow_cap)(a__test_conversion__2005_01_01_00_00)
--2 variables(available_flow_cap)(a__test_conversion__2005_01_01_01_00)
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 0.0
-<= 15.0
-<= 15.0
-\* Source Pyomo model name=None *\
-bounds
-c_u_constraints(available_flow_cap_binary)(0)_:
-c_u_constraints(available_flow_cap_binary)(1)_:
-c_u_constraints(available_flow_cap_binary_continuous_switch)(0)_:
-c_u_constraints(available_flow_cap_binary_continuous_switch)(1)_:
-c_u_constraints(available_flow_cap_continuous)(0)_:
-c_u_constraints(available_flow_cap_continuous)(1)_:
-c_u_constraints(piecewise_efficiency)(0)_:
-c_u_constraints(piecewise_efficiency)(1)_:
-c_u_constraints(piecewise_efficiency)(2)_:
-c_u_constraints(piecewise_efficiency)(3)_:
-c_u_constraints(piecewise_efficiency)(4)_:
-c_u_constraints(piecewise_efficiency)(5)_:
-end
-general
-min
-objectives(dummy_obj)(0):
-s.t.