diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index b84487d4..b096aa6d 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -19,6 +19,10 @@ Upcoming Release
 
 * Add cost assumptions for water network infrastructure: water pipeline HDPE and water pipeline booster pump (https://github.com/PyPSA/technology-data/pull/277)
 
+* Fix bug preventing add_energy_storage_database to run through
+
+* Fix bug preventing energy penalty for carbon capture technologies
+
 `v0.15.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.15.0>`__ (9th June 2026)
 ================================================================================================
 
diff --git a/outputs/US/costs_2020.csv b/outputs/US/costs_2020.csv
index 7cbdbcfc..869915f7 100644
--- a/outputs/US/costs_2020.csv
+++ b/outputs/US/costs_2020.csv
@@ -726,24 +726,24 @@ Commercial PV - Class 9,investment,2197.3314,USD/kW,NREL/ATB-https://data.openei
 Commercial PV - Class 9,investment,2197.4333,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Advanced
 Commercial PV - Class 9,investment,2197.4333,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Conservative
 Commercial PV - Class 9,investment,2197.4333,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Moderate
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,236402.053,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,945608.2119,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3231,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,37006.5997,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,52757073.9,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -940,21 +940,21 @@ Geothermal - NF EGS / Flash,investment,24658.2225,USD/kW,NREL/ATB-https://data.o
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,235531.201,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,181953.2473,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,143194.7276,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1069,17 +1069,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,2253.3123,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,236252.5505,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,945010.202,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,141525.5947,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,69153.4031,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1088,17 +1088,17 @@ Hydrogen fuel cell (trucks),FOM,10.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,190579.2348,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.46,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.46,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,1640004.9037,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.4801,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.4801,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,1591578.5566,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.4142,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Advanced
 Hydropower - NPD 2,CF,0.4142,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Conservative
 Hydropower - NPD 2,CF,0.4142,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Moderate
@@ -1651,10 +1651,10 @@ Large DW - Class 9,investment,2803.1503,USD/kW,NREL/ATB-https://data.openei.org/
 Lead-Acid-bicharger,FOM,2.4064,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,188262.2523,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2386,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,459291.5729,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,29624.0605,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1663,42 +1663,42 @@ Liquid fuels ICE (trucks),FOM,18.0,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,125446.7878,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,633273.8459,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,444639.0833,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,444639.0833,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.328,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,234806.1139,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.0701,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,120181.3115,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,409502.2614,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.0701,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,120181.3115,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.0379,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,467869.278,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,187813.7448,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,751254.9792,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,87286.4662,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2014,10 +2014,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.0701,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,120181.3115,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.2238,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,433564.6866,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Nuclear - Small,CF,0.937,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Moderate
 Nuclear - Small,CF,0.937,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Moderate
 Nuclear - Small,FOM,1.43,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Moderate
@@ -2745,24 +2745,24 @@ Pumped Storage Hydropower - National Class 9,investment,4615.8158,USD/kW,NREL/AT
 Pumped Storage Hydropower - National Class 9,investment,4615.8158,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Advanced
 Pumped Storage Hydropower - National Class 9,investment,4615.8158,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Conservative
 Pumped Storage Hydropower - National Class 9,investment,4615.8158,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Moderate
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,1014906.975,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,712594.2591,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,712594.2591,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.0615,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,39346.812,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,CF,0.104,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,CF,0.104,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Conservative
 Residential Battery Storage - 5 kW - 12.5 kWh,CF,0.104,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,Market,Moderate
@@ -3182,17 +3182,17 @@ SOEC,investment,2853.3765,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,2853.3765,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,2853.3765,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,191900.1461,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,767600.5844,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,10077.2151,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3461,31 +3461,31 @@ Utility-Scale Battery Storage - 8Hr,investment,3948.6026,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4028,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,188537.586,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.2335,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,399347.305,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1893,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,245053.2635,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.475,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,168856.8295,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2849,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,599275.7346,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2481,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,348122.7696,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,1266591.4581,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3545,9 +3545,10 @@ biogas,investment,1298.1448,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1298.1448,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.8842,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1476.4372,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.0877,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3712,14 +3713,16 @@ central gas CHP,VOM,5.8775,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,0.96,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.4167,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,788.1238,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.3051,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.8775,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,7.5371,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,0.96,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,788.1238,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3392,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5499,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,959.4591,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.25,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.4694,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -3758,20 +3761,20 @@ central solid biomass CHP,investment,4721.591,EUR/kW_e,"Danish Energy Agency, in
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8857,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.1467,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,12.4724,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3489,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2689,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.8255,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.2002,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9787,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,7279.8629,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8857,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.1467,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,9.3554,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3489,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2689,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.8255,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4721.591,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.2055,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.995,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,6299.6645,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -3925,9 +3928,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.2121,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3577,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.6515,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.848,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,33.7875,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.5455,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.4119,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -3935,9 +3938,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.5455,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.4119,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.6279,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7445,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,613.207,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4390,9 +4393,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,782.7022,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,5.4515,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.5186,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,782.7022,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.9336,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.6626,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1319.9232,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4414,12 +4417,12 @@ waste CHP,efficiency-heat,0.7635,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,11458.118,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.4016,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,36.4363,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,54.5496,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.2826,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2021,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.7635,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,11458.118,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1505,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.9325,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,16638.045,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/US/costs_2025.csv b/outputs/US/costs_2025.csv
index 862b247b..945d0bfd 100644
--- a/outputs/US/costs_2025.csv
+++ b/outputs/US/costs_2025.csv
@@ -762,24 +762,24 @@ Commercial PV - Class 9,investment,1957.0145,USD/kW,NREL/ATB-https://data.openei
 Commercial PV - Class 9,investment,1821.768,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Commercial PV - Class 9,investment,1877.4053,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Commercial PV - Class 9,investment,1957.0145,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,208849.9905,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,835399.9621,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3269,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,33619.1225,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,52757073.9,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -976,21 +976,21 @@ Geothermal - NF EGS / Flash,investment,10216.3713,USD/kW,NREL/ATB-https://data.o
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,216706.3462,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,167520.0281,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,131938.4362,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1105,17 +1105,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,2048.1505,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,208775.2393,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,835100.9572,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,129925.1361,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,54694.0551,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1124,17 +1124,17 @@ Hydrogen fuel cell (trucks),FOM,12.5,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,153760.7057,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.5473,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.5473,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,1038257.3947,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.5307,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.5307,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,1034058.8665,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -1687,10 +1687,10 @@ Large DW - Class 9,investment,3003.2136,USD/kW,NREL/ATB-https://data.openei.org/
 Lead-Acid-bicharger,FOM,2.4245,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,175137.1798,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2464,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,431216.2517,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,30564.5468,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1699,42 +1699,42 @@ Liquid fuels ICE (trucks),FOM,17.5,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,128930.862,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,615707.3038,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,432305.1282,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,432305.1282,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.3244,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,217364.1572,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.095,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,111360.6648,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,353420.141,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.095,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,111360.6648,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.0379,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,403408.7892,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,184555.8364,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,738223.3458,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,80131.8379,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2200,10 +2200,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.095,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,111360.6648,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.225,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,385163.2565,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 OCGT,FOM,1.7784,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0,,
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0,,
 OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
@@ -2867,24 +2867,24 @@ Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3647.8863,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,986361.344,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,692551.5819,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,692551.5819,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.1071,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,26932.4992,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3292,17 +3292,17 @@ SOEC,investment,2783.4145,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,2534.2418,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,2534.2418,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,186599.0371,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,746396.1484,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,9251.2139,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3541,31 +3541,31 @@ Utility-Scale Battery Storage - 8Hr,investment,4120.2073,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4212,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,175381.3672,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.234,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,361915.6199,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1773,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,232158.6741,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.2974,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,135698.4238,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2713,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,558841.5412,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2362,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,324451.5425,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,1151269.6095,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3625,9 +3625,10 @@ biogas,investment,1380.4471,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1380.4471,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.8847,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1567.8534,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.1577,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3792,14 +3793,16 @@ central gas CHP,VOM,5.744,EUR/MWh,"Danish Energy Agency, inputs/technology_data_
 central gas CHP,c_b,0.98,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.405,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.4133,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,768.0868,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.313,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.744,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,7.3393,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,0.98,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.405,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,768.0868,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3437,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5473,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,932.242,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.4026,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -3838,20 +3841,20 @@ central solid biomass CHP,investment,4597.9244,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8762,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.1352,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,12.484,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3498,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2694,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.825,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.2006,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9783,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,7091.3794,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8762,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.1352,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,9.3455,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3498,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2694,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.825,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4597.9244,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.2059,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.9946,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,6130.0491,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -4011,9 +4014,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.197,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.637,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.8487,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,32.8199,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.5227,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.415,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -4021,9 +4024,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.5227,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.415,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.6411,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7445,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,607.9335,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4460,9 +4463,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,765.4367,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,5.7564,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.5477,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,765.4367,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.9827,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.6626,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1290.8073,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4484,12 +4487,12 @@ waste CHP,efficiency-heat,0.7627,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,11146.0038,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.3789,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,35.9309,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,53.8347,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.2872,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2051,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.7627,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,11146.0038,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1527,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.9319,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,16173.5144,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/US/costs_2030.csv b/outputs/US/costs_2030.csv
index b8140b75..6eb61571 100644
--- a/outputs/US/costs_2030.csv
+++ b/outputs/US/costs_2030.csv
@@ -762,24 +762,24 @@ Commercial PV - Class 9,investment,1884.3208,USD/kW,NREL/ATB-https://data.openei
 Commercial PV - Class 9,investment,1410.958,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Commercial PV - Class 9,investment,1605.6886,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Commercial PV - Class 9,investment,1884.3208,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,48360651.075,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -976,21 +976,21 @@ Geothermal - NF EGS / Flash,investment,9967.3712,USD/kW,NREL/ATB-https://data.op
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1105,17 +1105,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1842.9888,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,41776.1995,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1124,17 +1124,17 @@ Hydrogen fuel cell (trucks),FOM,13.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,146475.709,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -1687,10 +1687,10 @@ Large DW - Class 9,investment,2611.3452,USD/kW,NREL/ATB-https://data.openei.org/
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,31432.1077,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1699,42 +1699,42 @@ Liquid fuels ICE (trucks),FOM,17.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,132416.1935,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2200,10 +2200,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3023,24 +3023,24 @@ Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3535.0651,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3448,17 +3448,17 @@ SOEC,investment,2713.4524,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,2215.1071,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,2215.1071,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3697,31 +3697,31 @@ Utility-Scale Battery Storage - 8Hr,investment,3332.1524,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,1035947.761,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3781,9 +3781,10 @@ biogas,investment,1200.989,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1200.989,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.8993,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1341.4438,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.2276,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3948,14 +3949,16 @@ central gas CHP,VOM,5.6104,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.41,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.41,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,748.0497,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.3214,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.6104,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,6.9349,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.41,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,748.0497,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3555,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5258,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,883.8307,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.8,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -3994,20 +3997,20 @@ central solid biomass CHP,investment,4474.2578,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8661,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.1237,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,11.6312,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3506,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2699,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.8245,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.2082,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9512,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,6573.5118,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8661,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.1237,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,8.8999,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3506,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2699,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.8245,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4474.2578,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.2131,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.9663,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,5758.8524,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -4167,9 +4170,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.1818,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3514,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.5857,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.8671,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,30.1079,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.5,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.4182,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -4177,9 +4180,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.5,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.4182,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.4865,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7712,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,558.6932,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4652,9 +4655,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,748.1712,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,6.0754,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.5768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,748.1712,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.6988,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.6864,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1192.0301,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4676,12 +4679,12 @@ waste CHP,efficiency-heat,0.7619,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,10833.8897,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.355,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,35.4254,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,50.7204,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.2918,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2081,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.7619,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,10833.8897,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1605,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.9029,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,15048.7814,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/US/costs_2035.csv b/outputs/US/costs_2035.csv
index 91268920..83f3a52d 100644
--- a/outputs/US/costs_2035.csv
+++ b/outputs/US/costs_2035.csv
@@ -762,24 +762,24 @@ Commercial PV - Class 9,investment,1811.627,USD/kW,NREL/ATB-https://data.openei.
 Commercial PV - Class 9,investment,1000.148,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Commercial PV - Class 9,investment,1333.9718,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Commercial PV - Class 9,investment,1811.627,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,46162439.6625,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -976,21 +976,21 @@ Geothermal - NF EGS / Flash,investment,9724.5342,USD/kW,NREL/ATB-https://data.op
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1105,17 +1105,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1675.1865,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,38625.3189,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1124,17 +1124,17 @@ Hydrogen fuel cell (trucks),FOM,13.0,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,147862.5491,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -1687,10 +1687,10 @@ Large DW - Class 9,investment,2465.7993,USD/kW,NREL/ATB-https://data.openei.org/
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,32215.4272,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1699,42 +1699,42 @@ Liquid fuels ICE (trucks),FOM,16.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,135900.2677,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2224,10 +2224,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3047,24 +3047,24 @@ Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3422.2439,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3472,17 +3472,17 @@ SOEC,investment,2647.2575,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,1967.0108,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,1967.0108,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3721,31 +3721,31 @@ Utility-Scale Battery Storage - 8Hr,investment,3221.8992,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,941625.7836,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3805,9 +3805,10 @@ biogas,investment,1180.2823,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1180.2823,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.9031,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1312.6624,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.2344,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3972,14 +3973,16 @@ central gas CHP,VOM,5.5436,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.415,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.415,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,734.6917,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.3545,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.5436,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,6.7977,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.415,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,734.6917,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3618,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5252,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,862.6091,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.7,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -4018,20 +4021,20 @@ central solid biomass CHP,investment,4409.6254,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8627,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.1515,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,11.4675,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3485,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2687,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.8257,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.2092,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9455,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,6389.1491,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8627,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.1515,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,8.7643,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3485,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2687,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.8257,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4409.6254,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.214,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.9602,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,5624.5645,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -4191,9 +4194,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.1667,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3529,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.5778,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.8719,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,29.6447,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.4773,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.4198,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -4201,9 +4204,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.4773,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.4198,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.4477,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7787,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,542.6524,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4676,9 +4679,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,730.9057,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,6.1236,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.5914,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,730.9057,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.6332,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.693,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1146.4544,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4700,12 +4703,12 @@ waste CHP,efficiency-heat,0.762,per unit,"Danish Energy Agency, inputs/technolog
 waste CHP,investment,10486.0774,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.3408,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,35.0974,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,49.6345,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.2947,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2102,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.762,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,10486.0774,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1637,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.8959,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,14394.9585,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/US/costs_2040.csv b/outputs/US/costs_2040.csv
index d7af51dd..7571481e 100644
--- a/outputs/US/costs_2040.csv
+++ b/outputs/US/costs_2040.csv
@@ -762,24 +762,24 @@ Commercial PV - Class 9,investment,1652.4086,USD/kW,NREL/ATB-https://data.openei
 Commercial PV - Class 9,investment,944.4238,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Commercial PV - Class 9,investment,1222.6972,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Commercial PV - Class 9,investment,1652.4086,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,43964228.25,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -976,21 +976,21 @@ Geothermal - NF EGS / Flash,investment,9487.7077,USD/kW,NREL/ATB-https://data.op
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1105,17 +1105,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1507.3843,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,37015.9307,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1124,17 +1124,17 @@ Hydrogen fuel cell (trucks),FOM,12.7,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,151102.7004,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -1687,10 +1687,10 @@ Large DW - Class 9,investment,2337.3722,USD/kW,NREL/ATB-https://data.openei.org/
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,32900.6745,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1699,42 +1699,42 @@ Liquid fuels ICE (trucks),FOM,16.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,139385.5992,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2224,10 +2224,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3047,24 +3047,24 @@ Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3384.6368,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3472,17 +3472,17 @@ SOEC,investment,2581.0626,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,1718.9145,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,1718.9145,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3721,31 +3721,31 @@ Utility-Scale Battery Storage - 8Hr,investment,3111.6459,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,847303.8062,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3805,9 +3805,10 @@ biogas,investment,1159.5756,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1159.5756,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.9069,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1284.0743,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.2411,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3972,14 +3973,16 @@ central gas CHP,VOM,5.4768,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.42,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.42,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,721.3337,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.3889,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.4768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,6.662,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.42,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,721.3337,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3683,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5247,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,841.5848,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.6,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -4018,20 +4021,20 @@ central solid biomass CHP,investment,4344.9931,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8591,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.1794,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,11.3008,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3465,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2675,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.8269,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.2103,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9398,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,6207.4742,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8591,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.1794,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,8.6323,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3465,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2675,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.8269,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4344.9931,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.215,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.9542,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,5491.6825,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -4191,9 +4194,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.1515,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.5698,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.8768,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,29.1816,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.4545,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -4201,9 +4204,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.4545,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.4086,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7862,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,526.9914,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4676,9 +4679,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,713.6403,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,6.1742,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.606,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,713.6403,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.5669,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.6997,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1101.7323,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4700,12 +4703,12 @@ waste CHP,efficiency-heat,0.7622,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,10138.2652,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.3255,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,34.7695,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,48.5596,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.2976,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2123,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.7622,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,10138.2652,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1669,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.8889,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,13753.071,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/US/costs_2045.csv b/outputs/US/costs_2045.csv
index f42f6d54..7acfbab9 100644
--- a/outputs/US/costs_2045.csv
+++ b/outputs/US/costs_2045.csv
@@ -762,24 +762,24 @@ Commercial PV - Class 9,investment,1493.1902,USD/kW,NREL/ATB-https://data.openei
 Commercial PV - Class 9,investment,888.6995,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Commercial PV - Class 9,investment,1111.4226,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Commercial PV - Class 9,investment,1493.1902,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,43964228.25,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -976,21 +976,21 @@ Geothermal - NF EGS / Flash,investment,9256.7429,USD/kW,NREL/ATB-https://data.op
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1105,17 +1105,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1331.5106,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,35406.5424,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1124,17 +1124,17 @@ Hydrogen fuel cell (trucks),FOM,12.4,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,154575.4585,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -1687,10 +1687,10 @@ Large DW - Class 9,investment,2208.9452,USD/kW,NREL/ATB-https://data.openei.org/
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,33457.6737,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1699,42 +1699,42 @@ Liquid fuels ICE (trucks),FOM,15.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,142869.6734,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2224,10 +2224,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3047,24 +3047,24 @@ Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3347.0297,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3472,17 +3472,17 @@ SOEC,investment,2518.0967,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,1526.7879,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,1526.7879,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3721,31 +3721,31 @@ Utility-Scale Battery Storage - 8Hr,investment,3001.3927,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,748444.8272,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3805,9 +3805,10 @@ biogas,investment,1125.0644,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1125.0644,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.9073,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1245.4026,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.2871,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3972,14 +3973,16 @@ central gas CHP,VOM,5.41,EUR/MWh,"Danish Energy Agency, inputs/technology_data_f
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.425,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.425,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,707.9756,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.4245,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.41,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,6.5769,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.425,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,707.9756,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3729,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5293,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,825.5955,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -4018,20 +4021,20 @@ central solid biomass CHP,investment,4280.3608,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8555,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.2072,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,11.3421,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3444,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2664,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.8282,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.2097,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9416,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,6105.2443,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8555,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.2072,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,8.6712,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3444,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2664,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.8282,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4280.3608,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.214,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.9552,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,5411.6273,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -4191,9 +4194,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.0909,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.5695,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.8774,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,29.1673,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.4318,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -4201,9 +4204,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.4318,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.4079,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7872,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,522.39,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4676,9 +4679,9 @@ solid biomass boiler steam,efficiency,0.895,per unit,"Danish Energy Agency, inpu
 solid biomass boiler steam,investment,696.3748,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,6.2273,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.606,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.895,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,696.3748,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.556,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.7045,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1072.9618,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4700,12 +4703,12 @@ waste CHP,efficiency-heat,0.7624,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,9790.453,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.3092,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,34.4415,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,48.0476,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.3005,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2144,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.7624,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,9790.453,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1688,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.8898,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,13266.842,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/US/costs_2050.csv b/outputs/US/costs_2050.csv
index 0bd572ae..8d126e84 100644
--- a/outputs/US/costs_2050.csv
+++ b/outputs/US/costs_2050.csv
@@ -762,24 +762,24 @@ Commercial PV - Class 9,investment,1333.9718,USD/kW,NREL/ATB-https://data.openei
 Commercial PV - Class 9,investment,832.9753,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Commercial PV - Class 9,investment,1000.148,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Commercial PV - Class 9,investment,1333.9718,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0,,
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0,,
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0,,
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
 "Container feeder, ammonia",investment,43964228.25,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0,,
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0,,
@@ -976,21 +976,21 @@ Geothermal - NF EGS / Flash,investment,9031.4948,USD/kW,NREL/ATB-https://data.op
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0,,
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0,,
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0,,
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0,,
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0,,
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0,,
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0,,
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0,,
@@ -1105,17 +1105,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1155.6369,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0,,
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",,,
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Hydrogen fuel cell (passenger cars),FOM,1.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0,,
 Hydrogen fuel cell (passenger cars),investment,33797.1541,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0,,
@@ -1124,17 +1124,17 @@ Hydrogen fuel cell (trucks),FOM,12.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
 Hydrogen fuel cell (trucks),investment,158059.5327,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0,,
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0,,
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0,,
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0,,
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0,,
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0,,
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0,,
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Hydropower - NPD 2,CF,0.38,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Hydropower - NPD 2,CF,0.41,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -1687,10 +1687,10 @@ Large DW - Class 9,investment,2100.897,USD/kW,NREL/ATB-https://data.openei.org/s
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0,,
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0,,
 Liquid fuels ICE (passenger cars),investment,33797.1541,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0,,
@@ -1699,42 +1699,42 @@ Liquid fuels ICE (trucks),FOM,15.5,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
 Liquid fuels ICE (trucks),investment,146355.0049,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0,,
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0,,
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0,,
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0,,
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0,,
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0,,
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0,,
@@ -2224,10 +2224,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Nuclear - Small,CF,0.93,per unit,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3047,24 +3047,24 @@ Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3309.4226,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Pumped Storage Hydropower One New Reservoir - National Class 5,investment,3723.1005,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0,,
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0,,
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0,,
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0,,
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0,,
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0,,
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0,,
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0,,
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Residential Battery Storage - 5 kW - 12.5 kWh,FOM,2.41,%/year,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
@@ -3472,17 +3472,17 @@ SOEC,investment,2455.1309,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.
 SOEC,investment,1334.6612,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
 SOEC,investment,1334.6612,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0,,
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0,,
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0,,
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0,,
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0,,
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0,,
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0,,
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0,,
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0,,
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0,,
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0,,
@@ -3721,31 +3721,31 @@ Utility-Scale Battery Storage - 8Hr,investment,2891.1394,USD/kW,NREL/ATB-https:/
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0,,
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0,,
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0,,
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0,,
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0,,
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0,,
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0,,
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0,,
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0,,
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",,,
 air separation unit,investment,649585.8482,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0,,
@@ -3805,9 +3805,10 @@ biogas,investment,1090.5532,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,,,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0,,
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,,,
-biogas CC,investment,1090.5532,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0,,
+biogas CC,efficiency,0.9078,per unit,Combination of biogas CC and gas boiler steam,,,,
+biogas CC,investment,1206.7751,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0,,
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0,,
 biogas manure,fuel,25.333,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0,,
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0,,
@@ -3972,14 +3973,16 @@ central gas CHP,VOM,5.3432,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0,,
 central gas CHP,efficiency,0.43,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
+central gas CHP,efficiency-heat,0.43,per unit,Calculated based on electric efficiency and back pressure ratio,,,,
 central gas CHP,investment,694.6176,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central gas CHP CC,FOM,3.4615,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0,,
-central gas CHP CC,VOM,5.3432,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0,,
+central gas CHP CC,VOM,6.492,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0,,
-central gas CHP CC,efficiency,0.43,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0,,
-central gas CHP CC,investment,694.6176,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0,,
+central gas CHP CC,efficiency,0.3775,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0,,
+central gas CHP CC,efficiency-heat,0.5339,per unit,Combination of central gas CHP CC and gas boiler steam,,,,
+central gas CHP CC,investment,809.637,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0,,
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0,,
 central gas boiler,FOM,3.4,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0,,
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0,,
@@ -4018,20 +4021,20 @@ central solid biomass CHP,investment,4215.7285,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0,,
 central solid biomass CHP CC,FOM,2.8518,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP CC,VOM,6.235,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP CC,VOM,11.3835,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,c_b,0.3423,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP CC,efficiency,0.2652,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP CC,efficiency-heat,0.8294,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
+central solid biomass CHP CC,efficiency,0.209,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
+central solid biomass CHP CC,efficiency-heat,0.9433,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0,,
 central solid biomass CHP CC,investment,6003.161,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0,,
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central solid biomass CHP powerboost CC,FOM,2.8518,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0,,
-central solid biomass CHP powerboost CC,VOM,6.235,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0,,
+central solid biomass CHP powerboost CC,VOM,8.7101,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,c_b,0.3423,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0,,
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0,,
-central solid biomass CHP powerboost CC,efficiency,0.2652,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,efficiency-heat,0.8294,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0,,
-central solid biomass CHP powerboost CC,investment,4215.7285,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0,,
+central solid biomass CHP powerboost CC,efficiency,0.2131,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,efficiency-heat,0.9561,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0,,
+central solid biomass CHP powerboost CC,investment,5331.5754,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0,,
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0,,
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0,,
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0,,
@@ -4191,9 +4194,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing gas CC,FOM,1.0303,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0,,
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0,,
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0,,
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0,,
+direct firing gas CC,VOM,0.5693,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
+direct firing gas CC,efficiency,0.8779,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0,,
+direct firing gas CC,investment,29.1532,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0,,
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0,,
 direct firing solid fuels,FOM,1.4091,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
 direct firing solid fuels,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
@@ -4201,9 +4204,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 direct firing solid fuels CC,FOM,1.4091,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0,,
-direct firing solid fuels CC,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0,,
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0,,
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0,,
+direct firing solid fuels CC,VOM,1.4073,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
+direct firing solid fuels CC,efficiency,0.7881,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0,,
+direct firing solid fuels CC,investment,517.7933,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0,,
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0,,
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0,,
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0,,
@@ -4676,9 +4679,9 @@ solid biomass boiler steam,efficiency,0.9,per unit,"Danish Energy Agency, inputs
 solid biomass boiler steam,investment,679.1093,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass boiler steam CC,FOM,6.2831,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0,,
-solid biomass boiler steam CC,VOM,3.606,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0,,
-solid biomass boiler steam CC,efficiency,0.9,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0,,
-solid biomass boiler steam CC,investment,679.1093,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0,,
+solid biomass boiler steam CC,VOM,5.5452,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
+solid biomass boiler steam CC,efficiency,0.7093,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0,,
+solid biomass boiler steam CC,investment,1044.3192,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0,,
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0,,
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0,,
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,,,
@@ -4700,12 +4703,12 @@ waste CHP,efficiency-heat,0.7625,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,9442.6408,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 waste CHP CC,FOM,2.2917,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0,,
-waste CHP CC,VOM,34.1135,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0,,
+waste CHP CC,VOM,47.538,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,c_b,0.3034,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0,,
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0,,
-waste CHP CC,efficiency,0.2165,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0,,
-waste CHP CC,efficiency-heat,0.7625,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0,,
-waste CHP CC,investment,9442.6408,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0,,
+waste CHP CC,efficiency,0.1707,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,efficiency-heat,0.8906,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0,,
+waste CHP CC,investment,12782.3917,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0,,
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0,,
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0,,
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0,,
diff --git a/outputs/costs_2020.csv b/outputs/costs_2020.csv
index 401256d1..243f99c8 100644
--- a/outputs/costs_2020.csv
+++ b/outputs/costs_2020.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1613.1603,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,236402.053,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,945608.2119,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3231,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,37006.5997,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,52757073.9,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,235531.201,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,181953.2473,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,143194.7276,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,2253.3123,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,236252.5505,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,945010.202,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,141525.5947,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,69153.4031,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,10.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,190579.2348,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.46,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.46,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,1640004.9037,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.4801,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.4801,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,1591578.5566,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4064,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,188262.2523,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2386,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,459291.5729,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,29624.0605,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,18.0,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,125446.7878,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,633273.8459,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,444639.0833,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,444639.0833,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.328,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,234806.1139,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.0701,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,120181.3115,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,409502.2614,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.0701,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,120181.3115,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.0379,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,467869.278,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,187813.7448,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,751254.9792,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,87286.4662,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.0701,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,120181.3115,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.2238,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,433564.6866,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.7772,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,1014906.975,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,712594.2591,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,712594.2591,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.0615,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,39346.812,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.22,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2966.3513,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,191900.1461,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,767600.5844,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,10077.2151,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4028,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,188537.586,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.2335,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,399347.305,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1893,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,245053.2635,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.475,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,168856.8295,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2849,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,599275.7346,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2481,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,348122.7696,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,1266591.4581,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1298.1448,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1298.1448,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.8842,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1476.4372,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.0877,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.8775,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,0.96,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.4167,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,788.1238,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.3051,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.8775,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,7.5371,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,0.96,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,788.1238,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3392,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5499,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,959.4591,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.25,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.4694,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4721.591,EUR/kW_e,"Danish Energy Agency, in
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8857,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.1467,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,12.4724,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3489,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2689,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.8255,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.2002,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9787,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,7279.8629,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8857,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.1467,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,9.3554,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3489,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2689,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.8255,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4721.591,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.2055,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.995,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,6299.6645,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.2121,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3577,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.6515,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.848,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,33.7875,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.5455,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.4119,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.5455,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.4119,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.6279,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7445,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,613.207,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,782.7022,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,5.4515,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.5186,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,782.7022,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.9336,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.6626,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1319.9232,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.7635,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,11458.118,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.4016,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,36.4363,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,54.5496,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.2826,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2021,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.7635,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,11458.118,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1505,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.9325,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,16638.045,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/outputs/costs_2025.csv b/outputs/costs_2025.csv
index 739fb6a2..3c9a0171 100644
--- a/outputs/costs_2025.csv
+++ b/outputs/costs_2025.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1415.7588,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,208849.9905,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,835399.9621,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3269,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,33619.1225,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,52757073.9,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,216706.3462,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,167520.0281,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,131938.4362,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,2048.1505,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,208775.2393,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,835100.9572,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,129925.1361,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,54694.0551,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,12.5,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,153760.7057,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.5473,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.5473,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,1038257.3947,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.5307,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.5307,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,1034058.8665,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4245,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,175137.1798,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2464,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,431216.2517,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,30564.5468,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,17.5,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,128930.862,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,615707.3038,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,432305.1282,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,432305.1282,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.3244,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,217364.1572,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.095,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,111360.6648,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,353420.141,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.095,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,111360.6648,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.0379,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,403408.7892,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,184555.8364,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,738223.3458,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,80131.8379,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.095,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,111360.6648,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.225,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,385163.2565,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.7784,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.405,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,986361.344,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,692551.5819,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,692551.5819,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.1071,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,26932.4992,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.205,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2893.6192,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,186599.0371,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,746396.1484,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,9251.2139,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4212,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,175381.3672,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.234,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,361915.6199,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1773,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,232158.6741,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.2974,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,135698.4238,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2713,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,558841.5412,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2362,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,324451.5425,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,1151269.6095,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1380.4471,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1380.4471,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.8847,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1567.8534,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.1577,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.744,EUR/MWh,"Danish Energy Agency, inputs/technology_data_
 central gas CHP,c_b,0.98,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.405,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.4133,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,768.0868,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.313,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.744,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,7.3393,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,0.98,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.405,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,768.0868,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3437,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5473,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,932.242,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.4026,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4597.9244,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8762,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.1352,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,12.484,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3498,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2694,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.825,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.2006,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9783,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,7091.3794,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8762,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.1352,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,9.3455,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3498,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2694,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.825,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4597.9244,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.2059,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.9946,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,6130.0491,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.197,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.637,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.8487,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,32.8199,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.5227,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.415,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.5227,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.415,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.6411,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7445,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,607.9335,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,765.4367,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,5.7564,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.5477,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,765.4367,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.9827,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.6626,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1290.8073,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.7627,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,11146.0038,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.3789,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,35.9309,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,53.8347,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.2872,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2051,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.7627,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,11146.0038,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1527,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.9319,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,16173.5144,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/outputs/costs_2030.csv b/outputs/costs_2030.csv
index 3f11f846..9ada9a13 100644
--- a/outputs/costs_2030.csv
+++ b/outputs/costs_2030.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1263.6213,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,48360651.075,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1842.9888,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,41776.1995,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,13.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,146475.709,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,31432.1077,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,17.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,132416.1935,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.7795,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.41,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.19,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2820.8871,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,1035947.761,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1200.989,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1200.989,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.8993,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1341.4438,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.2276,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.6104,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.41,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.41,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,748.0497,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.3214,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.6104,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,6.9349,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.41,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,748.0497,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3555,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5258,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,883.8307,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.8,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4474.2578,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8661,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.1237,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,11.6312,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3506,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2699,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.8245,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.2082,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9512,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,6573.5118,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8661,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.1237,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,8.8999,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3506,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2699,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.8245,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4474.2578,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.2131,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.9663,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,5758.8524,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.1818,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3514,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.5857,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.8671,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,30.1079,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.5,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.4182,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.5,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.4182,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.4865,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7712,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,558.6932,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,748.1712,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,6.0754,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.5768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,748.1712,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.6988,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.6864,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1192.0301,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.7619,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,10833.8897,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.355,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,35.4254,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,50.7204,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.2918,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2081,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.7619,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,10833.8897,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1605,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.9029,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,15048.7814,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/outputs/costs_2035.csv b/outputs/costs_2035.csv
index 6cdfc1ff..fe76b1ff 100644
--- a/outputs/costs_2035.csv
+++ b/outputs/costs_2035.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1263.6213,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,46162439.6625,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1675.1865,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.1,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,38625.3189,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,13.0,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,147862.5491,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,32215.4272,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,16.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,135900.2677,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.785,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.415,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.17,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2752.0713,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,941625.7836,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1180.2823,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1180.2823,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.9031,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1312.6624,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.2344,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.5436,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.415,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.415,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,734.6917,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.3545,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.5436,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,6.7977,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.415,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,734.6917,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3618,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5252,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,862.6091,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.7,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4409.6254,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8627,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.1515,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,11.4675,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3485,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2687,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.8257,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.2092,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9455,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,6389.1491,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8627,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.1515,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,8.7643,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3485,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2687,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.8257,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4409.6254,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.214,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.9602,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,5624.5645,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.1667,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3529,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.5778,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.8719,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,29.6447,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.4773,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.4198,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.4773,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.4198,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.4477,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7787,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,542.6524,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,730.9057,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,6.1236,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.5914,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,730.9057,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.6332,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.693,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1146.4544,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.762,per unit,"Danish Energy Agency, inputs/technolog
 waste CHP,investment,10486.0774,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.3408,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,35.0974,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,49.6345,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.2947,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2102,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.762,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,10486.0774,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1637,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.8959,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,14394.9585,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/outputs/costs_2040.csv b/outputs/costs_2040.csv
index 9aee8c35..2fb5e563 100644
--- a/outputs/costs_2040.csv
+++ b/outputs/costs_2040.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1263.6213,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,43964228.25,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1507.3843,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,37015.9307,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,12.7,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,151102.7004,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,32900.6745,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,16.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,139385.5992,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.7906,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.42,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.15,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2683.2555,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,847303.8062,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1159.5756,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1159.5756,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.9069,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1284.0743,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.2411,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.4768,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.42,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.42,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,721.3337,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.3889,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.4768,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,6.662,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.42,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,721.3337,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3683,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5247,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,841.5848,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.6,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4344.9931,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8591,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.1794,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,11.3008,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3465,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2675,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.8269,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.2103,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9398,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,6207.4742,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8591,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.1794,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,8.6323,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3465,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2675,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.8269,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4344.9931,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.215,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.9542,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,5491.6825,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.1515,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.5698,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.8768,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,29.1816,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.4545,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.4545,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.4086,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7862,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,526.9914,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.89,per unit,"Danish Energy Agency, input
 solid biomass boiler steam,investment,713.6403,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,6.1742,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.606,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.89,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,713.6403,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.5669,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.6997,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1101.7323,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.7622,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,10138.2652,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.3255,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,34.7695,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,48.5596,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.2976,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2123,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.7622,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,10138.2652,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1669,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.8889,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,13753.071,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/outputs/costs_2045.csv b/outputs/costs_2045.csv
index e32c7482..7ef7c3c1 100644
--- a/outputs/costs_2045.csv
+++ b/outputs/costs_2045.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1263.6213,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,43964228.25,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1331.5106,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,35406.5424,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,12.4,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,154575.4585,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,33457.6737,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,15.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,142869.6734,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.7964,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.425,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.13,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2617.7966,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,748444.8272,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1125.0644,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1125.0644,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.9073,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1245.4026,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.2871,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.41,EUR/MWh,"Danish Energy Agency, inputs/technology_data_f
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.425,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.425,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,707.9756,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.4245,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.41,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,6.5769,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.425,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,707.9756,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3729,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5293,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,825.5955,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.5,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4280.3608,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8555,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.2072,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,11.3421,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3444,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2664,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.8282,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.2097,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9416,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,6105.2443,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8555,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.2072,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,8.6712,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3444,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2664,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.8282,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4280.3608,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.214,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.9552,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,5411.6273,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.0909,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.5695,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.8774,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,29.1673,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.4318,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.4318,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.4079,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7872,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,522.39,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.895,per unit,"Danish Energy Agency, inpu
 solid biomass boiler steam,investment,696.3748,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,6.2273,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.606,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.895,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,696.3748,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.556,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.7045,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1072.9618,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.7624,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,9790.453,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.3092,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,34.4415,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,48.0476,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.3005,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2144,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.7624,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,9790.453,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1688,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.8898,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,13266.842,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/outputs/costs_2050.csv b/outputs/costs_2050.csv
index 8ff494eb..90d5163d 100644
--- a/outputs/costs_2050.csv
+++ b/outputs/costs_2050.csv
@@ -134,24 +134,24 @@ Charging infrastructure fuel cell vehicles trucks,lifetime,30.0,years,PATHS TO A
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,FOM,1.8,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,investment,1263.6213,EUR/Lades�ule,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2025.0
 Charging infrastructure slow (purely) battery electric vehicles passenger cars,lifetime,30.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Charging infrastructure slow (purely) battery electric vehicles passenger cars,2020.0
-Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,FOM,0.9265,%/year,"Viswanathan_2022, p.64 (p.86) Figure 4.14","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-bicharger,efficiency,0.7211,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.52^0.5']}",2020.0
 Compressed-Air-Adiabatic-bicharger,investment,1189666.0381,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Turbine Compressor BOP EPC Management']}",2025.0
-Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Compressed-Air-Adiabatic-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'pair', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Compressed-Air-Adiabatic-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB 4.5.2.1 Fixed O&M p.62 (p.84)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Compressed-Air-Adiabatic-store,investment,6850.9515,EUR/MWh,"Viswanathan_2022, p.64 (p.86)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Cavern Storage']}",2025.0
-Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
-Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Compressed-Air-Adiabatic-store,lifetime,60.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['pair'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
+Concrete-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Concrete-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Concrete-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'concrete'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Concrete-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Concrete-discharger,efficiency,0.4343,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Concrete-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Concrete-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Concrete-store,investment,30231.6454,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Concrete-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['concrete'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 "Container feeder, ammonia",efficiency,0.7754,MWh/km,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
 "Container feeder, ammonia",investment,43964228.25,EUR,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2025.0
 "Container feeder, ammonia",lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_maritime_commercial_freight_and_passenger_transport.xlsx","Container feeder, ammonia",2023.0
@@ -258,21 +258,21 @@ General liquid hydrocarbon storage (product),lifetime,30.0,years,"Stelter and Ni
 Gravity-Brick-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Brick-bicharger,efficiency,0.9274,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.86^0.5']}",2020.0
 Gravity-Brick-bicharger,investment,522511.1911,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-bicharger,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['elec', 'gravity', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Brick-store,investment,197881.4914,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Brick-store,lifetime,41.7,years,"Viswanathan_2022, p.77 (p.99) Table 4.36","{'carrier': ['gravity'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Aboveground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Aboveground-bicharger,investment,459720.1467,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywa', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Aboveground-store,investment,153086.8088,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Aboveground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywa'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-bicharger,FOM,1.5,%/year,"Viswanathan_2022, p.76 (p.98) Sentence 1 in 4.7.2 Operating Costs","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['1.5 percent of capital cost']}",2020.0
 Gravity-Water-Underground-bicharger,efficiency,0.9014,per unit,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level ((0.785+0.84)/2)^0.5']}",2020.0
 Gravity-Water-Underground-bicharger,investment,1138087.6802,EUR/MW,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 0% cost reduction for 2030 compared to 2021","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Power Equipment']}",2025.0
-Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['elec', 'gravitywu', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Gravity-Water-Underground-store,investment,120682.1448,EUR/MWh,"Viswanathan_2022, p.71 (p.94) text at the bottom speaks about 15% cost reduction for 2030 compared to 2021","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Gravitational Capital (SB+BOS)']}",2025.0
-Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Gravity-Water-Underground-store,lifetime,60.0,years,"Viswanathan_2022, p.77 (p.99) Table 4.37","{'carrier': ['gravitywu'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 H2 (g) fill compressor station,FOM,1.7,%/year,"Guidehouse 2020: European Hydrogen Backbone report, https://guidehouse.com/-/media/www/site/downloads/energy/2020/gh_european-hydrogen-backbone_report.pdf (table 3, table 5)","Pessimistic (highest) value chosen for 48'' pipeline w/ 13GW_H2 LHV @ 100bar pressure. Currency year: Not clearly specified, assuming year of publication. Forecast year: Not clearly specified, guessing based on text remarks.",2020.0
 H2 (g) fill compressor station,investment,5981.7263,EUR/MW_H2,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 164, Figure 14 (Fill compressor).","Assumption for staging 35→140bar, 6000 MW_HHV single line pipeline. Considering HHV/LHV ration for H2.",2025.0
 H2 (g) fill compressor station,lifetime,20.0,years,"Danish Energy Agency, Technology Data for Energy Transport (2021), pg. 168, Figure 24 (Fill compressor).",,2015.0
@@ -387,17 +387,17 @@ Haber-Bosch,hydrogen-input,1.1484,MWh_H2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low car
 Haber-Bosch,investment,1155.6369,EUR/kW_NH3,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
 Haber-Bosch,lifetime,30.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Technical lifetime,2015.0
 Haber-Bosch,nitrogen-input,0.1597,t_N2/MWh_NH3,"DECHEMA 2017: DECHEMA: Low carbon energy and feedstock for the European chemical industry (https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry.pdf), pg. 57.",".33 MWh electricity are required for ASU per t_NH3, considering 0.4 MWh are required per t_N2 and LHV of NH3 of 5.1666 Mwh.",
-HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+HighT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 HighT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+HighT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'salthight'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+HighT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 HighT-Molten-Salt-discharger,efficiency,0.4444,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 HighT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 HighT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 HighT-Molten-Salt-store,investment,118324.6775,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+HighT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['salthight'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Hydrogen fuel cell (passenger cars),FOM,1.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),efficiency,0.48,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2020.0
 Hydrogen fuel cell (passenger cars),investment,33797.1541,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (passenger cars),2025.0
@@ -406,17 +406,17 @@ Hydrogen fuel cell (trucks),FOM,12.2,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM
 Hydrogen fuel cell (trucks),efficiency,0.56,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
 Hydrogen fuel cell (trucks),investment,158059.5327,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2025.0
 Hydrogen fuel cell (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Hydrogen fuel cell (trucks),2020.0
-Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Hydrogen-charger,FOM,0.6345,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Hydrogen-charger,efficiency,0.6963,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2020.0
 Hydrogen-charger,investment,436509.8856,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['Electrolyzer']}",2025.0
-Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, NULL","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Hydrogen-charger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['elec', 'h2cavern'], 'technology_type': ['charger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+Hydrogen-discharger,FOM,0.5812,%/year,"Viswanathan_2022, str","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Hydrogen-discharger,efficiency,0.4869,per unit,"Viswanathan_2022, p.111 (p.133) include inverter 0.98 & transformer efficiency 0.98 ","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2020.0
 Hydrogen-discharger,investment,476539.1764,EUR/MW,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['Fuel Cell']}",2025.0
-Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-discharger,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern', 'elec'], 'technology_type': ['discharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Hydrogen-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB =(C38+C39)*0.43/4","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Hydrogen-store,investment,6010.0,EUR/MWh,"Viswanathan_2022, p.113 (p.135)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['Cavern Storage']}",2025.0
-Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Hydrogen-store,lifetime,30.0,years,"Viswanathan_2022, p.111 (p.133)","{'carrier': ['h2cavern'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 LNG storage tank,FOM,2.0,%/year,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
 LNG storage tank,investment,838.182,EUR/m^3,"Hurskainen 2019, https://cris.vtt.fi/en/publications/liquid-organic-hydrogen-carriers-lohc-concept-evaluation-and-tech pg. 46 (59).",Currency year and technology year assumed based on publication date.,2025.0
 LNG storage tank,lifetime,20.0,years,"Guesstimate, based on H2 (l) storage tank with comparable requirements.",Currency year and technology year assumed based on publication date.,2019.0
@@ -447,10 +447,10 @@ LOHC unloaded DBT storage,lifetime,30.0,years,,"Based on storage “General liqu
 Lead-Acid-bicharger,FOM,2.4427,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lead-Acid-bicharger,efficiency,0.8832,per unit,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.78^0.5']}",2020.0
 Lead-Acid-bicharger,investment,162012.1073,EUR/MW,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['elec', 'lead', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lead-Acid-store,FOM,0.2542,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lead-Acid-store,investment,403140.9306,EUR/MWh,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lead-Acid-store,lifetime,12.0,years,"Viswanathan_2022, p.33 (p.55)","{'carrier': ['lead'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Liquid fuels ICE (passenger cars),FOM,1.6,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),efficiency,0.215,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2020.0
 Liquid fuels ICE (passenger cars),investment,33797.1541,EUR/PKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (passenger cars),2025.0
@@ -459,42 +459,42 @@ Liquid fuels ICE (trucks),FOM,15.5,%,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM Th
 Liquid fuels ICE (trucks),efficiency,0.373,per unit,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
 Liquid fuels ICE (trucks),investment,146355.0049,EUR/LKW,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2025.0
 Liquid fuels ICE (trucks),lifetime,15.0,years,PATHS TO A CLIMATE-NEUTRAL ENERGY SYSTEM The German energy transformation in its social context. https://www.ise.fraunhofer.de/en/publications/studies/paths-to-a-climate-neutral-energy-system.html,Liquid fuels ICE (trucks),2020.0
-Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Liquid-Air-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-charger,investment,598140.7616,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Liquid-Air-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'lair'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Liquid-Air-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Liquid-Air-discharger,efficiency,0.55,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.545 assume 99% for charge and other for discharge']}",2020.0
-Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-discharger,investment,419971.173,EUR/MW,"Georgiou_2018, str","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Liquid-Air-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Liquid-Air-store,FOM,0.3208,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Liquid-Air-store,investment,199922.2004,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Liquid Air SB and BOS']}",2025.0
-Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Liquid-Air-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['lair'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-LFP-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-LFP-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-bicharger,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'lfp', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-LFP-store,FOM,0.0447,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-LFP-store,investment,297338.0207,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-LFP-store,lifetime,16.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['lfp'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Lithium-Ion-NMC-bicharger,efficiency,0.9193,per unit,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.8452^0.5']}",2020.0
 Lithium-Ion-NMC-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Lithium-Ion-NMC-bicharger,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['elec', 'nmc', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Lithium-Ion-NMC-store,FOM,0.038,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Lithium-Ion-NMC-store,investment,338948.3003,EUR/MWh,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Lithium-Ion-NMC-store,lifetime,13.0,years,"Viswanathan_2022, p.24 (p.46)","{'carrier': ['nmc'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 LowT-Molten-Salt-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+LowT-Molten-Salt-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'saltlowt'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+LowT-Molten-Salt-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 LowT-Molten-Salt-discharger,efficiency,0.5394,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 LowT-Molten-Salt-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 LowT-Molten-Salt-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 LowT-Molten-Salt-store,investment,72977.2095,EUR/MWh,"Viswanathan_2022, p.98 (p.120)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+LowT-Molten-Salt-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['saltlowt'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 MeOH transport ship,FOM,5.0,%/year,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,capacity,75000.0,t_MeOH,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2020.0
 MeOH transport ship,investment,44006711.0399,EUR,"Assume comparable tanker as for LOHC transport above, c.f. Runge et al 2020, Table 10, https://papers.ssrn.com/abstract=3623514 .",,2025.0
@@ -516,10 +516,10 @@ NH3 (l) transport ship,lifetime,20.0,years,"Guess estimated based on H2 (l) tank
 Ni-Zn-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Ni-Zn-bicharger,efficiency,0.9,per unit,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['((0.75-0.87)/2)^0.5 mean value of range efficiency is not RTE but single way AC-store conversion']}",2020.0
 Ni-Zn-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81) same as Li-LFP","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'nizn', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Ni-Zn-store,FOM,0.2262,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Ni-Zn-store,investment,336761.8265,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 OCGT,FOM,1.8023,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2025.0
 OCGT,efficiency,0.43,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0
@@ -533,24 +533,24 @@ PHS,FOM,1.0,%/year,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa
 PHS,efficiency,0.75,per unit,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2015.0
 PHS,investment,2888.5279,EUR/kWel,DIW DataDoc http://hdl.handle.net/10419/80348, from old pypsa cost assumptions,2025.0
 PHS,lifetime,80.0,years,IEA2010, from old pypsa cost assumptions,2015.0
-Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
-Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, NULL","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
+Pumped-Heat-charger,FOM,0.366,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Pumped-Heat-charger,efficiency,0.99,per unit,"Viswanathan_2022, str","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Charger']}",2020.0
 Pumped-Heat-charger,investment,957815.7129,EUR/MW,"Georgiou_2018, Figure 9 of reference roughly 80% of capital cost are power related 47%/80% of costs are required for liquefaction (charging)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Pumped-Heat-charger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'phes'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Heat-discharger,FOM,0.5212,%/year,"Viswanathan_2022, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Pumped-Heat-discharger,efficiency,0.63,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE 0.62 assume 99% for charge and other for discharge']}",2020.0
-Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, NULL","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Pumped-Heat-discharger,investment,672508.9048,EUR/MW,"Georgiou_2018, str","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
+Pumped-Heat-discharger,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Pumped-Heat-store,FOM,0.1528,%/year,"Viswanathan_2022, p.103 (p.125)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Pumped-Heat-store,investment,14518.1865,EUR/MWh,"Viswanathan_2022, p.92 (p.114)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['Molten Salt based SB and BOS']}",2025.0
-Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Heat-store,lifetime,33.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['phes'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Pumped-Storage-Hydro-bicharger,FOM,0.9951,%/year,"Viswanathan_2022, Figure 4.16","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-bicharger,efficiency,0.8944,per unit,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['AC-AC efficiency at transformer level 0.8^0.5']}",2020.0
 Pumped-Storage-Hydro-bicharger,investment,1756657.9565,EUR/MW,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['Powerhouse Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-bicharger,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['elec', 'phs', 'elec'], 'technology_type': ['bicharger'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 Pumped-Storage-Hydro-store,FOM,0.43,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['derived']}",2020.0
 Pumped-Storage-Hydro-store,investment,71761.1936,EUR/MWh,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['Reservoir Construction & Infrastructure']}",2025.0
-Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['NULL']}",2020.0
+Pumped-Storage-Hydro-store,lifetime,60.0,years,"Viswanathan_2022, p.68 (p.90)","{'carrier': ['phs'], 'technology_type': ['store'], 'type': ['mechanical'], 'note': ['str']}",2020.0
 SMR,FOM,5.0,%/year,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2015.0
 SMR,efficiency,0.76,per unit (in LHV),"IEA Global average levelised cost of hydrogen production by energy source and technology, 2019 and 2050 (2020), https://www.iea.org/data-and-statistics/charts/global-average-levelised-cost-of-hydrogen-production-by-energy-source-and-technology-2019-and-2050",,
 SMR,investment,659179.2942,EUR/MW_CH4,Danish Energy Agency,"Technology data for renewable fuels, in pdf on table 3 p.311",2025.0
@@ -564,17 +564,17 @@ SOEC,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,US-based assumptions for a Con
 SOEC,electricity-input,1.11,MWh_el/MWh_H2,ICCT IRA e-fuels assumptions ,,
 SOEC,investment,2552.3377,USD/kW,"ICCT IRA e-fuels assumptions, https://theicct.org/wp-content/uploads/2022/02/fuels-eu-cost-renew-H-produced-onsite-H-refueling-stations-europe-feb22.pdf adjusted according to DOE observations https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/24005-clean-hydrogen-production-cost-pem-electrolyzer.pdf?sfvrsn=8cb10889_1#:~:text=This%20Record%20shows%20that%20the,factors%20of%2050%2D75%25",US-based assumptions for a Conservative cost scenario,2025.0
 SOEC,lifetime,30.0,years,ICCT IRA e-fuels assumptions ,,
-Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, NULL","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
+Sand-charger,FOM,1.075,%/year,"Viswanathan_2022, str","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on charger']}",2020.0
 Sand-charger,efficiency,0.99,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-charger,investment,181297.9281,EUR/MW,"Georgiou_2018, Guesstimate that charge is 20% of capital costs of power components for sensible thermal storage","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['Power Equipment Charge']}",2025.0
-Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
-Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, NULL","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
+Sand-charger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['elec', 'sand'], 'technology_type': ['charger'], 'type': ['thermal'], 'note': ['str']}",2020.0
+Sand-discharger,FOM,0.2688,%/year,"Viswanathan_2022, str","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Guesstimate, 50% on discharger']}",2020.0
 Sand-discharger,efficiency,0.53,per unit,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['RTE assume 99% for charge and other for discharge']}",2020.0
 Sand-discharger,investment,725191.7123,EUR/MW,"Georgiou_2018, Guesstimate that charge is 80% of capital costs of power components for sensible thermal storage","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['Power Equipment Discharge']}",2025.0
-Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-discharger,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand', 'elec'], 'technology_type': ['discharger'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Sand-store,FOM,0.3308,%/year,"Viswanathan_2022, p 104 (p.126)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['not provided calculated as for hydrogen']}",2020.0
 Sand-store,investment,8425.2126,EUR/MWh,"Viswanathan_2022, p.100 (p.122)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['SB and BOS 0.85 of 2021 value']}",2025.0
-Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['NULL']}",2020.0
+Sand-store,lifetime,35.0,years,"Viswanathan_2022, p.107 (p.129)","{'carrier': ['sand'], 'technology_type': ['store'], 'type': ['thermal'], 'note': ['str']}",2020.0
 Steam methane reforming,FOM,3.0,%/year,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
 Steam methane reforming,investment,627941.6326,EUR/MW_H2,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW). Currency conversion 1.17 USD = 1 EUR.,2025.0
 Steam methane reforming,lifetime,30.0,years,"International Energy Agency (2015): Technology Roadmap Hydrogen and Fuel Cells , table 15.",Large scale SMR facility (150-300 MW).,2015.0
@@ -591,31 +591,31 @@ Steam methane reforming,methane-input,1.483,MWh_CH4/MWh_H2,"Keipi et al (2018):
 Vanadium-Redox-Flow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['30% assumed of power components every 10 years']}",2020.0
 Vanadium-Redox-Flow-bicharger,efficiency,0.8062,per unit,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['AC-AC efficiency at transformer level 0.65^0.5']}",2020.0
 Vanadium-Redox-Flow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-bicharger,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['elec', 'vanadium', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Vanadium-Redox-Flow-store,FOM,0.2345,%/year,"Viswanathan_2022, p.28 (p.50)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['0.43 % of SB']}",2020.0
 Vanadium-Redox-Flow-store,investment,324483.9347,EUR/MWh,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Vanadium-Redox-Flow-store,lifetime,12.0,years,"Viswanathan_2022, p.42 (p.64)","{'carrier': ['vanadium'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Air-bicharger,efficiency,0.7937,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.63)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Air-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-bicharger,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znair', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Air-store,FOM,0.1654,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Air-store,investment,219264.0846,EUR/MWh,"Viswanathan_2022, p.48 (p.70) text below Table 4.12","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Air-store,lifetime,25.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znair'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-bicharger,FOM,2.1198,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Flow-bicharger,efficiency,0.8307,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25 ","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['(0.69)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Flow-bicharger,investment,102540.0181,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-bicharger,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['elec', 'znbrflow', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Flow-store,FOM,0.2576,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Flow-store,investment,518407.3478,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Flow-store,lifetime,10.0,years,"Viswanathan_2022, p.59 (p.81) Table 4.27","{'carrier': ['znbrflow'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-bicharger,FOM,2.4395,%/year,"Viswanathan_2022, p.51-52 in  section 4.4.2","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Guesstimate 30% assumed of power components every 10 years ']}",2020.0
 Zn-Br-Nonflow-bicharger,efficiency,0.8888,per unit,"Viswanathan_2022, p.59 (p.81) Table 4.25","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': [' (0.79)^0.5  efficiency is not RTE but single way AC-store conversion']}",2020.0
 Zn-Br-Nonflow-bicharger,investment,162225.1483,EUR/MW,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['Power Equipment']}",2025.0
-Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-bicharger,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['elec', 'znbr', 'elec'], 'technology_type': ['bicharger'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 Zn-Br-Nonflow-store,FOM,0.2244,%/year,"Viswanathan_2022, 0.43 % of SB","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['derived']}",2020.0
 Zn-Br-Nonflow-store,investment,300780.3155,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table 4.14","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['DC storage block']}",2025.0
-Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0
+Zn-Br-Nonflow-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['znbr'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['str']}",2020.0
 air separation unit,FOM,3.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Fixed O&M,2015.0
 air separation unit,electricity-input,0.25,MWh_el/t_N2,"DEA (2022): Technology Data for Renewable Fuels (https://ens.dk/en/our-services/projections-and-models/technology-data/technology-data-renewable-fuels), p.288.","For consistency reasons use value from Danish Energy Agency. DEA also reports range of values (0.2-0.4 MWh/t_N2) on pg. 288. Other efficienices reported are even higher, e.g. 0.11 Mwh/t_N2 from Morgan (2013): Techno-Economic Feasibility Study of Ammonia Plants Powered by Offshore Wind .",
 air separation unit,investment,649585.8482,EUR/t_N2/h,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",103 Hydrogen to Ammonia:  Specific investment,2025.0
@@ -654,9 +654,10 @@ biogas,investment,1090.5532,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for
 biogas,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas CC,CO2 stored,0.1447,tCO2/MWh_th,"Stoichiometric calculation, doi:10.1016/j.apenergy.2022.120016",,
 biogas CC,FOM,7.7769,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Total O&M",2020.0
+biogas CC,VOM,,EUR/MWh,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
-biogas CC,efficiency,1.0,per unit,Assuming input biomass is already given in biogas output,,
-biogas CC,investment,1090.5532,EUR/kW,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Specific investment",2025.0
+biogas CC,efficiency,0.9078,per unit,Combination of biogas CC and gas boiler steam,,
+biogas CC,investment,1206.7751,EUR/kW,Combination of biogas CC and gas boiler steam,,2025.0
 biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","81 Biogas, Basic plant, small:  Technical lifetime",2020.0
 biogas manure,fuel,25.333,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2025.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
@@ -788,14 +789,16 @@ central gas CHP,VOM,5.3432,EUR/MWh,"Danish Energy Agency, inputs/technology_data
 central gas CHP,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
 central gas CHP,c_v,0.17,per unit,DEA (loss of fuel for additional heat), from old pypsa cost assumptions,2015.0
 central gas CHP,efficiency,0.43,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
+central gas CHP,efficiency-heat,0.43,per unit,Calculated based on electric efficiency and back pressure ratio,,
 central gas CHP,investment,694.6176,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
 central gas CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central gas CHP CC,FOM,3.4615,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Fixed O&M",2015.0
-central gas CHP CC,VOM,5.3432,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Variable O&M",2025.0
+central gas CHP CC,VOM,6.492,EUR/MWh,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,c_b,1.0,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Cb coefficient",2015.0
-central gas CHP CC,efficiency,0.43,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Electricity efficiency, annual average",2015.0
-central gas CHP CC,investment,694.6176,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Nominal investment",2025.0
+central gas CHP CC,efficiency,0.3775,per unit,Combination of central gas CHP CC and gas boiler steam,,2015.0
+central gas CHP CC,efficiency-heat,0.5339,per unit,Combination of central gas CHP CC and gas boiler steam,,
+central gas CHP CC,investment,809.637,EUR/kW,Combination of central gas CHP CC and gas boiler steam,,2025.0
 central gas CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","04 Gas turb. simple cycle, L:  Technical lifetime",2015.0
 central gas boiler,FOM,3.4,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Fixed O&M,2015.0
 central gas boiler,VOM,1.3358,EUR/MWh_th,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",44 Natural Gas DH Only:  Variable O&M,2025.0
@@ -834,20 +837,20 @@ central solid biomass CHP,investment,4215.7285,EUR/kW_e,"Danish Energy Agency, i
 central solid biomass CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP,p_nom_ratio,1.0,per unit,, from old pypsa cost assumptions,2015.0
 central solid biomass CHP CC,FOM,2.8518,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP CC,VOM,6.235,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP CC,VOM,11.3835,EUR/MWh_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,c_b,0.3423,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP CC,efficiency,0.2652,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP CC,efficiency-heat,0.8294,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
+central solid biomass CHP CC,efficiency,0.209,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
+central solid biomass CHP CC,efficiency-heat,0.9433,per unit,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2015.0
 central solid biomass CHP CC,investment,6003.161,EUR/kW_e,Combination of central solid biomass CHP CC and solid biomass boiler steam,,2025.0
 central solid biomass CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central solid biomass CHP powerboost CC,FOM,2.8518,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Fixed O&M",2015.0
-central solid biomass CHP powerboost CC,VOM,6.235,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Variable O&M ",2025.0
+central solid biomass CHP powerboost CC,VOM,8.7101,EUR/MWh_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,c_b,0.3423,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cb coefficient",2015.0
 central solid biomass CHP powerboost CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Cv coefficient",2015.0
-central solid biomass CHP powerboost CC,efficiency,0.2652,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Electricity efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,efficiency-heat,0.8294,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Heat efficiency, net, annual average",2015.0
-central solid biomass CHP powerboost CC,investment,4215.7285,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Nominal investment ",2025.0
+central solid biomass CHP powerboost CC,efficiency,0.2131,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,efficiency-heat,0.9561,per unit,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2015.0
+central solid biomass CHP powerboost CC,investment,5331.5754,EUR/kW_e,Combination of central solid biomass CHP powerboost CC and electric boiler steam,,2025.0
 central solid biomass CHP powerboost CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","09a Wood Chips, Large 50 degree:  Technical lifetime",2015.0
 central water pit charger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Charger efficiency,2020.0
 central water pit discharger,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_catalogue_for_energy_storage.xlsx",:  Discharger efficiency,2020.0
@@ -948,9 +951,9 @@ direct firing gas,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technolo
 direct firing gas,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
 direct firing gas,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing gas CC,FOM,1.0303,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Fixed O&M,2019.0
-direct firing gas CC,VOM,0.3545,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Variable O&M,2025.0
-direct firing gas CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.a Direct firing Natural Gas:  Total efficiency, net, annual average",2019.0
-direct firing gas CC,investment,18.992,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Nominal investment,2025.0
+direct firing gas CC,VOM,0.5693,EUR/MWh,Combination of direct firing gas CC and gas boiler steam,,2025.0
+direct firing gas CC,efficiency,0.8779,per unit,Combination of direct firing gas CC and gas boiler steam,,2019.0
+direct firing gas CC,investment,29.1532,EUR/kW,Combination of direct firing gas CC and gas boiler steam,,2025.0
 direct firing gas CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.a Direct firing Natural Gas:  Technical lifetime,2019.0
 direct firing solid fuels,FOM,1.4091,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
 direct firing solid fuels,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
@@ -958,9 +961,9 @@ direct firing solid fuels,efficiency,1.0,per unit,"Danish Energy Agency, inputs/
 direct firing solid fuels,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
 direct firing solid fuels,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 direct firing solid fuels CC,FOM,1.4091,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Fixed O&M,2019.0
-direct firing solid fuels CC,VOM,0.4214,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Variable O&M,2025.0
-direct firing solid fuels CC,efficiency,1.0,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","312.b Direct firing Sold Fuels:  Total efficiency, net, annual average",2019.0
-direct firing solid fuels CC,investment,278.5499,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Nominal investment,2025.0
+direct firing solid fuels CC,VOM,1.4073,EUR/MWh,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
+direct firing solid fuels CC,efficiency,0.7881,per unit,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2019.0
+direct firing solid fuels CC,investment,517.7933,EUR/kW,Combination of direct firing solid fuels CC and solid biomass boiler steam,,2025.0
 direct firing solid fuels CC,lifetime,15.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",312.b Direct firing Sold Fuels:  Technical lifetime,2019.0
 distribution grid reinforcement,FOM,2.0,%/year,same as 'electricity distribution grid',,2020.0
 distribution grid reinforcement,investment,188.6002,EUR/kW,DEA - Technology Data Catalogue for el and DH - v17 - Page 15 - Paragraph 'Cost of grid expansion',"The costs of grid expansion from adding a new electricity generator or a new large consumer -  related to strengthening or expansion of the local grid and/or substations (voltage transformation, pumping or compression/expansion)",2025.0
@@ -1249,9 +1252,9 @@ solid biomass boiler steam,efficiency,0.9,per unit,"Danish Energy Agency, inputs
 solid biomass boiler steam,investment,679.1093,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
 solid biomass boiler steam,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass boiler steam CC,FOM,6.2831,%/year,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Fixed O&M,2019.0
-solid biomass boiler steam CC,VOM,3.606,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Variable O&M,2025.0
-solid biomass boiler steam CC,efficiency,0.9,per unit,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx","311.1e Steam boiler Wood:  Total efficiency, net, annual average",2019.0
-solid biomass boiler steam CC,investment,679.1093,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Nominal investment,2025.0
+solid biomass boiler steam CC,VOM,5.5452,EUR/MWh,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
+solid biomass boiler steam CC,efficiency,0.7093,per unit,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2019.0
+solid biomass boiler steam CC,investment,1044.3192,EUR/kW,Combination of solid biomass boiler steam CC and solid biomass boiler steam,,2025.0
 solid biomass boiler steam CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_industrial_process_heat.xlsx",311.1e Steam boiler Wood:  Technical lifetime,2019.0
 solid biomass to hydrogen,FOM,4.25,%/year,"Zech et.al. DBFZ Report Nr. 19. Hy-NOW - Evaluierung der Verfahren und Technologien für die Bereitstellung von Wasserstoff auf Basis von Biomasse, DBFZ, 2014",,2014.0
 solid biomass to hydrogen,capture rate,0.9,per unit,Assumption based on doi:10.1016/j.biombioe.2015.01.006,,
@@ -1273,12 +1276,12 @@ waste CHP,efficiency-heat,0.7625,per unit,"Danish Energy Agency, inputs/technolo
 waste CHP,investment,9442.6408,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
 waste CHP,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 waste CHP CC,FOM,2.2917,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Fixed O&M",2015.0
-waste CHP CC,VOM,34.1135,EUR/MWh_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Variable O&M ",2025.0
+waste CHP CC,VOM,47.538,EUR/MWh_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,c_b,0.3034,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cb coefficient",2015.0
 waste CHP CC,c_v,1.0,50°C/100°C,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Cv coefficient",2015.0
-waste CHP CC,efficiency,0.2165,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Electricity efficiency, net, annual average",2015.0
-waste CHP CC,efficiency-heat,0.7625,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Heat efficiency, net, annual average",2015.0
-waste CHP CC,investment,9442.6408,EUR/kW_e,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Nominal investment ",2025.0
+waste CHP CC,efficiency,0.1707,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,efficiency-heat,0.8906,per unit,Combination of waste CHP CC and solid biomass boiler steam,,2015.0
+waste CHP CC,investment,12782.3917,EUR/kW_e,Combination of waste CHP CC and solid biomass boiler steam,,2025.0
 waste CHP CC,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","08 WtE CHP, Large, 50 degree:  Technical lifetime",2015.0
 water pipeline HDPE (171.65mm 16 bar),FOM,5.0,%/year,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15",,2022.0
 water pipeline HDPE (171.65mm 16 bar),investment,1776.9015,EUR/(m^3-H2O/h)/km,"HYPAT_WP_Water-Supply-for-Electrolysis-Plants, https://hypat.de/hypat-wAssets/docs/new/publikationen/HYPAT_WP_Water-Supply-for-Electrolysis-Plants.pdf, Sec. 4.3 + 8.1; accessed 2026-06-15 -> Based on installed pipeline cost of ~198,430 EUR-2022/km (di=171.65mm, 16 bar; Eq. 15 / Fig. 4-7 incl. installation factor) divided by design water flow rate of 34.71 kg/s = 124.956 m^3/h (1000 MW electrolyzer demand): 198,430 / 124.956 = 1588 EUR/(m^3-H2O/h)/km",High-density polyethylene (HDPE) water pipeline cost,2025.0
diff --git a/scripts/compile_cost_assumptions.py b/scripts/compile_cost_assumptions.py
index 29a8bb75..aec3262b 100644
--- a/scripts/compile_cost_assumptions.py
+++ b/scripts/compile_cost_assumptions.py
@@ -3266,23 +3266,46 @@ def energy_penalty(cost_dataframe: pd.DataFrame) -> pd.DataFrame:
         "direct firing solid fuels CC",
         "direct firing gas CC",
         "biogas CC",
+        "central gas CHP CC",
+        "central solid biomass CHP powerboost CC",
     ]:
         if "powerboost" in tech_name:
             boiler = "electric boiler steam"
             feedstock = "solid biomass"
             co2_capture = cost_dataframe.loc[(feedstock, "CO2 intensity"), "value"]
+        elif "biogas" in tech_name:
+            boiler = "gas boiler steam"
+            co2_capture = cost_dataframe.loc[(tech_name, "CO2 stored"), "value"]
+            cost_dataframe.loc[(tech_name, "VOM"), "unit"] = "EUR/MWh"
         elif "gas" in tech_name:
             boiler = "gas boiler steam"
             feedstock = "gas"
             co2_capture = cost_dataframe.loc[(feedstock, "CO2 intensity"), "value"]
-        elif "biogas" in tech_name:
-            boiler = "gas boiler steam"
-            co2_capture = cost_dataframe.loc[(tech_name, "CO2 stored"), "value"]
         else:
             boiler = "solid biomass boiler steam"
             feedstock = "solid biomass"
             co2_capture = cost_dataframe.loc[(feedstock, "CO2 intensity"), "value"]
 
+        if "gas CHP" in tech_name:
+            base_tech = "central gas CHP"
+            cost_dataframe.loc[(base_tech, "efficiency-heat"), "value"] = (
+                cost_dataframe.loc[(base_tech, "efficiency"), "value"]
+                / cost_dataframe.loc[(base_tech, "c_b"), "value"]
+            )
+            cost_dataframe.loc[(base_tech, "efficiency-heat"), "source"] = (
+                "Calculated based on electric efficiency and back pressure ratio"
+            )
+            cost_dataframe.loc[(base_tech, "efficiency-heat"), "unit"] = "per unit"
+
+            cost_dataframe.loc[(tech_name, "efficiency-heat"), "value"] = (
+                cost_dataframe.loc[(tech_name, "efficiency"), "value"]
+                / cost_dataframe.loc[(tech_name, "c_b"), "value"]
+            )
+            cost_dataframe.loc[(tech_name, "efficiency-heat"), "source"] = (
+                "Calculated based on electric efficiency and back pressure ratio"
+            )
+            cost_dataframe.loc[(tech_name, "efficiency-heat"), "unit"] = "per unit"
+
         # Scaling biomass input to account for heat demand of carbon capture
         scalingFactor = 1 / (
             1
@@ -3295,46 +3318,37 @@ def energy_penalty(cost_dataframe: pd.DataFrame) -> pd.DataFrame:
             (boiler, "efficiency"), "value"
         ]
         eta_old = cost_dataframe.loc[(tech_name, "efficiency"), "value"]
+        eta_main = eta_old * scalingFactor
 
-        eta_main = (
-            cost_dataframe.loc[(tech_name, "efficiency"), "value"] * scalingFactor
-        )
+        source = f"Combination of {tech_name} and {boiler}"
 
         # Adapting investment share of tech due to steam boiler addition. Investment per MW_el.
         cost_dataframe.loc[(tech_name, "investment"), "value"] = (
             cost_dataframe.loc[(tech_name, "investment"), "value"] * eta_old / eta_main
             + cost_dataframe.loc[(boiler, "investment"), "value"] * eta_steam / eta_main
         )
-        cost_dataframe.loc[(tech_name, "investment"), "source"] = (
-            "Combination of " + tech_name + " and " + boiler
-        )
+        cost_dataframe.loc[(tech_name, "investment"), "source"] = source
         cost_dataframe.loc[(tech_name, "investment"), "further description"] = ""
 
-        if cost_dataframe.loc[(tech_name, "VOM"), "value"]:
-            break
-        else:
+        if (tech_name, "VOM") not in cost_dataframe.index:
             cost_dataframe.loc[(tech_name, "VOM"), "value"] = 0.0
 
         cost_dataframe.loc[(tech_name, "VOM"), "value"] = (
             cost_dataframe.loc[(tech_name, "VOM"), "value"] * eta_old / eta_main
             + cost_dataframe.loc[(boiler, "VOM"), "value"] * eta_steam / eta_main
         )
-        cost_dataframe.loc[(tech_name, "VOM"), "source"] = (
-            "Combination of " + tech_name + " and " + boiler
-        )
+        cost_dataframe.loc[(tech_name, "VOM"), "source"] = source
         cost_dataframe.loc[(tech_name, "VOM"), "further description"] = ""
 
         cost_dataframe.loc[(tech_name, "efficiency"), "value"] = eta_main
-        cost_dataframe.loc[(tech_name, "efficiency"), "source"] = (
-            "Combination of " + tech_name + " and " + boiler
-        )
+        cost_dataframe.loc[(tech_name, "efficiency"), "source"] = source
         cost_dataframe.loc[(tech_name, "efficiency"), "further description"] = ""
 
         if "CHP" in tech_name:
             cost_dataframe.loc[(tech_name, "efficiency-heat"), "value"] = (
                 cost_dataframe.loc[(tech_name, "efficiency-heat"), "value"]
                 * scalingFactor
-                + cost_dataframe.loc[("solid biomass", "CO2 intensity"), "value"]
+                + co2_capture
                 * (
                     cost_dataframe.loc[("biomass CHP capture", "heat-output"), "value"]
                     + cost_dataframe.loc[
@@ -3342,26 +3356,11 @@ def energy_penalty(cost_dataframe: pd.DataFrame) -> pd.DataFrame:
                     ]
                 )
             )
-            cost_dataframe.loc[(tech_name, "efficiency-heat"), "source"] = (
-                "Combination of " + tech_name + " and " + boiler
-            )
+            cost_dataframe.loc[(tech_name, "efficiency-heat"), "source"] = source
             cost_dataframe.loc[
                 (tech_name, "efficiency-heat"), "further description"
             ] = ""
 
-        if "biogas CC" in tech_name:
-            cost_dataframe.loc[(tech_name, "VOM"), "value"] = 0
-            cost_dataframe.loc[(tech_name, "VOM"), "unit"] = "EUR/MWh"
-
-        cost_dataframe.loc[(tech_name, "VOM"), "value"] = (
-            cost_dataframe.loc[(tech_name, "VOM"), "value"] * eta_old / eta_main
-            + cost_dataframe.loc[(boiler, "VOM"), "value"] * eta_steam / eta_main
-        )
-        cost_dataframe.loc[(tech_name, "VOM"), "source"] = (
-            "Combination of " + tech_name + " and " + boiler
-        )
-        cost_dataframe.loc[(tech_name, "VOM"), "further description"] = ""
-
     return cost_dataframe
 
 
@@ -3806,17 +3805,24 @@ def add_energy_storage_database(
     df = df.drop(columns=["ref_size_MW", "EP_ratio_h"])
     df = df.fillna(df.dtypes.replace({"float64": 0.0, "O": "NULL"}))
     df.loc[:, "unit"] = df.unit.str.replace("NULL", "per unit")
+    df.loc[(df["parameter"] == "efficiency") & (df["unit"].isna()), "unit"] = "per unit"
 
     # b) Change data to PyPSA format (aggregation of components, units, currency, etc.)
     df = clean_up_units(df, "value")  # base clean up
 
     # rewrite technology to be charger, store, discharger, bidirectional-charger
     df.loc[:, "carrier"] = df.carrier.str.replace("NULL", "")
-    df.loc[:, "carrier"] = df["carrier"].apply(lambda x: x.split("-"))
-    carrier_list_len = df["carrier"].apply(lambda x: len(x))
-    carrier_str_len = df["carrier"].apply(lambda x: len(x[0]))
-    carrier_first_item = df["carrier"].apply(lambda x: x[0])
-    carrier_last_item = df["carrier"].apply(lambda x: x[-1])
+    df["carrier"] = (
+        df["carrier"]
+        .fillna("")
+        .astype(str)
+        .str.strip()
+        .apply(lambda x: x.split("-") if x else [])
+    )
+    carrier_list_len = df["carrier"].apply(len)
+    carrier_str_len = df["carrier"].apply(lambda x: len(x[0]) if len(x) > 0 else 0)
+    carrier_first_item = df["carrier"].apply(lambda x: x[0] if len(x) > 0 else "")
+    carrier_last_item = df["carrier"].apply(lambda x: x[-1] if len(x) > 0 else "")
     bicharger_filter = carrier_list_len == 3
     charger_filter = (carrier_list_len == 2) & (carrier_first_item == "elec")
     discharger_filter = (carrier_list_len == 2) & (carrier_last_item == "elec")
@@ -3937,7 +3943,8 @@ def add_energy_storage_database(
                     or tech_name == "Pumped-Heat-store"
                 ):
                     x1 = pd.concat(
-                        [x, pd.DataFrame(other_segments_points)], ignore_index=True
+                        [x.reset_index(drop=True), pd.Series(other_segments_points)],
+                        ignore_index=True,
                     )
                     y1 = y
                     factor = 5
@@ -3950,7 +3957,7 @@ def add_energy_storage_database(
                             number_of_terms=i + 1,
                         )
                         y1 = pd.concat(
-                            [y1, pd.DataFrame([cost_at_year])], ignore_index=True
+                            [y1, pd.Series([cost_at_year])], ignore_index=True
                         )
                     f = interpolate.interp1d(
                         x1.squeeze(),
@@ -3960,7 +3967,8 @@ def add_energy_storage_database(
                     )
                 elif tech_name == "Hydrogen-charger":
                     x2 = pd.concat(
-                        [x, pd.DataFrame(other_segments_points)], ignore_index=True
+                        [x.reset_index(drop=True), pd.Series(other_segments_points)],
+                        ignore_index=True,
                     )
                     y2 = y
                     factor = 6.5
@@ -3971,7 +3979,7 @@ def add_energy_storage_database(
                             number_of_terms=i + 1,
                         )
                         y2 = pd.concat(
-                            [y2, pd.DataFrame([cost_at_year])], ignore_index=True
+                            [y2, pd.Series([cost_at_year])], ignore_index=True
                         )
                     f = interpolate.interp1d(
                         x2.squeeze(),
@@ -3981,7 +3989,8 @@ def add_energy_storage_database(
                     )
                 else:
                     x3 = pd.concat(
-                        [x, pd.DataFrame(other_segments_points)], ignore_index=True
+                        [x.reset_index(drop=True), pd.Series(other_segments_points)],
+                        ignore_index=True,
                     )
                     y3 = y
                     factor = 2
@@ -3992,7 +4001,7 @@ def add_energy_storage_database(
                             number_of_terms=i + 1,
                         )
                         y3 = pd.concat(
-                            [y3, pd.DataFrame([cost_at_year])], ignore_index=True
+                            [y3, pd.Series([cost_at_year])], ignore_index=True
                         )
                     f = interpolate.interp1d(
                         x3.squeeze(),
@@ -4038,7 +4047,10 @@ def add_energy_storage_database(
                 df = pd.concat([df, df_new], ignore_index=True)
 
     # d) Combine metadata and add to cost database
+    df["source"] = df["source"].fillna("").astype(str)
+    df["reference"] = df["reference"].fillna("").astype(str)
     df.loc[:, "source"] = df["source"] + ", " + df["reference"]
+    df["note"] = df["note"].fillna("NULL").astype(str)
     for i in df.index:
         df.loc[i, "further description"] = str(
             {