diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index bdddd2cf..64cd1566 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -655,7 +655,7 @@ def insert_electricity_distribution_grid(network):
                  lifetime=costs.at['electricity distribution grid','lifetime'],
                  capital_cost=costs.at['electricity distribution grid','fixed']*snakemake.config["sector"]['electricity_distribution_grid_cost_factor'])
 
-    loads = network.loads.index[network.loads.carrier=="electricity"]
+    loads = network.loads.index[network.loads.carrier.str.contains("electricity")]
     network.loads.loc[loads,"bus"] += " low voltage"
 
     bevs = network.links.index[network.links.carrier == "BEV charger"]
@@ -667,22 +667,33 @@ def insert_electricity_distribution_grid(network):
     hps = network.links.index[network.links.carrier.str.contains("heat pump")]
     network.links.loc[hps,"bus0"] += " low voltage"
 
+    rh = network.links.index[network.links.carrier.str.contains("resistive heater")]
+    network.links.loc[rh, "bus0"] += " low voltage"
+
+    mchp = network.links.index[network.links.carrier.str.contains("micro gas")]
+    network.links.loc[mchp, "bus1"] += " low voltage"
+
     #set existing solar to cost of utility cost rather the 50-50 rooftop-utility
     solar = network.generators.index[network.generators.carrier == "solar"]
-    network.generators.loc[solar,"capital_cost"] = costs.at['solar-utility','fixed']
+    network.generators.loc[solar, "capital_cost"] = costs.at['solar-utility',
+                                                             'fixed']
+    # add max solar rooftop potential assuming 1kW/person
+    potential = pd.concat([pop_layout.total.rename(index = lambda x: x + " solar"),
+                           network.generators.loc[solar, "p_nom_max"]],
+                          axis=1).min(axis=1)
 
-    network.madd("Generator", solar,
+
+    network.madd("Generator",
+                 solar,
                  suffix=" rooftop",
-                 bus=network.generators.loc[solar,"bus"] + " low voltage",
+                 bus=network.generators.loc[solar, "bus"] + " low voltage",
                  carrier="solar rooftop",
                  p_nom_extendable=True,
-                 p_nom_max=network.generators.loc[solar,"p_nom_max"],
+                 p_nom_max=potential,
                  marginal_cost=network.generators.loc[solar, 'marginal_cost'],
-                 capital_cost=costs.at['solar-rooftop','fixed'],
+                 capital_cost=costs.at['solar-rooftop', 'fixed'],
                  efficiency=network.generators.loc[solar, 'efficiency'],
-                 p_max_pu=network.generators_t.p_max_pu[solar],
-                 lifetime=costs.at['solar-rooftop','lifetime'])
-
+                 p_max_pu=network.generators_t.p_max_pu[solar])
 
 
     network.add("Carrier","home battery")
@@ -1682,7 +1693,7 @@ if __name__ == "__main__":
                        timezone_mappings='pypsa-eur-sec/data/timezone_mappings.csv',
                        co2_budget='pypsa-eur-sec/data/co2_budget.csv',
                        clustered_pop_layout='pypsa-eur-sec/resources/pop_layout_{network}_s{simpl}_{clusters}.csv',
-                       costs='pypsa-eur-sec/data/costs/costs_{planning_horizons}.csv',
+                       costs='technology-data/outputs/costs_{planning_horizons}.csv',
                        profile_offwind_ac='pypsa-eur/resources/profile_offwind-ac.nc',
                        profile_offwind_dc='pypsa-eur/resources/profile_offwind-dc.nc',
                        clustermaps="pypsa-eur/resources/clustermaps_{network}_s{simpl}_{clusters}.h5",