diff --git a/nibe/data/s1156_s1256.csv b/nibe/data/s1156_s1256.csv
old mode 100644
new mode 100755
index 409cb51..a8ce69f
--- a/nibe/data/s1156_s1256.csv
+++ b/nibe/data/s1156_s1256.csv
@@ -9,7 +9,7 @@ Hot water top (BT7)	MODBUS_INPUT_REGISTER	8	10	°C	s16	0	0	0
 Hot water charging (BT6)	MODBUS_INPUT_REGISTER	9	10	°C	s16	0	0	0
 Brine in (BT10)	MODBUS_INPUT_REGISTER	10	10	°C	s16	0	0	0
 Brine out (BT11)	MODBUS_INPUT_REGISTER	11	10	°C	s16	0	0	0
-Condenser sensor, supply line (BT12)	MODBUS_INPUT_REGISTER	12	10	°C	s16	0	0	0
+Condenser sensor supply line (BT12)	MODBUS_INPUT_REGISTER	12	10	°C	s16	0	0	0
 Discharge (BT14)	MODBUS_INPUT_REGISTER	13	10	°C	s16	0	0	0
 Liquid line (BT15)	MODBUS_INPUT_REGISTER	14	10	°C	s16	0	0	0
 Suction gas (BT17)	MODBUS_INPUT_REGISTER	16	10	°C	s16	0	0	0
@@ -135,7 +135,7 @@ Compressor, total time pool, heat pump 1 (EP15)	MODBUS_INPUT_REGISTER	263	1	h	u3
 Compressor, total time pool 2, heat pump 1 (EP15)	MODBUS_INPUT_REGISTER	265	1	h	u32	0	0	0
 Compressor, total time pool, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	269	1	h	u32	0	2147483647	0
 Compressor, total time pool 2, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	271	1	h	u32	0	2147483647	0
-Compressor, total time cooling, main unit (EP14)	MODBUS_INPUT_REGISTER	279	1	h	u32	0	2147483647	0
+Total run time compressor cooling	MODBUS_INPUT_REGISTER	279	1	h	u32	0	2147483647	0
 Compressor, total time pool, main unit (EP14)	MODBUS_INPUT_REGISTER	281	1	h	u32	0	2147483647	0
 Compressor, total time pool 2, main unit (EP14)	MODBUS_INPUT_REGISTER	283	1	h	u32	0	2147483647	0
 Heat pump 8 requested compressor frequency	MODBUS_INPUT_REGISTER	294	1	Hz	u8	0	0	0
@@ -478,7 +478,7 @@ Oper. mode shunt climate system 2	MODBUS_INPUT_REGISTER	1032	1		u8	0	0	0
 Oper. mode shunt climate system 1	MODBUS_INPUT_REGISTER	1033	1		u8	0	0	0
 Operating. mode shunt controlled additional heat	MODBUS_INPUT_REGISTER	1034	1		u8	0	0	0
 Fan mode 1	MODBUS_INPUT_REGISTER	1037	1	%	u8	0	0	0
-Current hot water mode	MODBUS_INPUT_REGISTER	1038	1		s8	0	0	0
+Current hot water mode without SPA/SC	MODBUS_INPUT_REGISTER	1038	1		s8	0	0	0
 Min frequency compressor	MODBUS_INPUT_REGISTER	1041	1	Hz	s16	0	0	0
 Max frequency compressor	MODBUS_INPUT_REGISTER	1042	1	Hz	s16	0	0	0
 Compressor frequency, current	MODBUS_INPUT_REGISTER	1046	10	Hz	u16	0	0	0
@@ -687,13 +687,13 @@ Requested compressor frequency (EP15)	MODBUS_INPUT_REGISTER	1855	1	Hz	u8	0	0	0
 Requested compressor frequency	MODBUS_INPUT_REGISTER	1856	1	Hz	u8	0	0	0
 Operating mode, shunt controlled brine (QN41)	MODBUS_INPUT_REGISTER	2410	1		u8	0	0	0
 Low press. sensor, unprocessed (EB100-EP15)	MODBUS_INPUT_REGISTER	1905	1		s16	0	0	0
-Current sensor (EB100-EP15)	MODBUS_INPUT_REGISTER	1906	10	A	s16	0	0	0
+Current (EB100-EP15)	MODBUS_INPUT_REGISTER	1906	10	A	s16	0	0	0
 Low press. sensor, unprocessed (EB100-EP14)	MODBUS_INPUT_REGISTER	1908	1		s16	0	0	0
-Current sensor (EB100-EP14)	MODBUS_INPUT_REGISTER	1909	10	A	s16	0	0	0
+Current (EB100-EP14)	MODBUS_INPUT_REGISTER	1909	10	A	s16	0	0	0
 Operating mode (SG Ready)	MODBUS_INPUT_REGISTER	1911	1		u8	0	0	0
 SG ready, input A	MODBUS_INPUT_REGISTER	1912	1		u8	0	0	0
 SG ready, input B	MODBUS_INPUT_REGISTER	1913	1		u8	0	0	0
-Hot water comfort mode (SPA)	MODBUS_INPUT_REGISTER	1915	1		s8	0	0	0
+Hot water mode (SPA)	MODBUS_INPUT_REGISTER	1915	1		s8	0	0	0
 Pool offset (SPA)	MODBUS_INPUT_REGISTER	1916	1		s8	0	0	0
 Cooling offset (SPA)	MODBUS_INPUT_REGISTER	1917	1		s8	0	0	0
 Operating mode (Smart Price Adaption)	MODBUS_INPUT_REGISTER	1918	1		u8	0	0	0
@@ -729,7 +729,7 @@ External adjustment climate system 2	MODBUS_HOLDING_REGISTER	50	1		s8	-10	10	0
 External adjustment climate system 1	MODBUS_HOLDING_REGISTER	51	1		s8	-10	10	0
 External adjustment with room sensor climate system 2	MODBUS_HOLDING_REGISTER	54	10	°C	s16	50	300	200
 External adjustment with room sensor climate system 1	MODBUS_HOLDING_REGISTER	55	10	°C	s16	50	300	200
-Hot water demand mode	MODBUS_HOLDING_REGISTER	56	1		s8	0	4	1
+Hot water mode	MODBUS_HOLDING_REGISTER	56	1		s8	0	4	1
 Start temperature HW high temperature	MODBUS_HOLDING_REGISTER	58	10	°C	s16	50	700	530
 Start temperature HW normal temperature	MODBUS_HOLDING_REGISTER	59	10	°C	s16	50	600	480
 Start temperature HW low temperature	MODBUS_HOLDING_REGISTER	60	10	°C	s16	50	550	450
@@ -754,7 +754,7 @@ Activate forced control	MODBUS_HOLDING_REGISTER	5000	1		u8	0	0	0
 DM start heating	MODBUS_HOLDING_REGISTER	97	1	DM	s16	-1000	-30	-60
 DM between additional heat step	MODBUS_HOLDING_REGISTER	100	1	DM	s16	10	1000	100
 Max. internal additional heat	MODBUS_HOLDING_REGISTER	102	100	kW	s16	0	4500	700
-Fuse	MODBUS_HOLDING_REGISTER	103	1	A	u16	1	400	25
+Fuse	MODBUS_HOLDING_REGISTER	103	1	A	u16	1	400	16
 Phase Order L3	MODBUS_HOLDING_REGISTER	2747	1		u8	1	128	4
 Phase Order L2	MODBUS_HOLDING_REGISTER	2746	1		u8	1	128	2
 Phase Order L1	MODBUS_HOLDING_REGISTER	2745	1		u8	1	128	1
@@ -840,12 +840,12 @@ Room sensor factor climate system 4	MODBUS_HOLDING_REGISTER	207	10		u8	0	60	20
 Room sensor factor climate system 3	MODBUS_HOLDING_REGISTER	208	10		u8	0	60	20
 Room sensor factor climate system 2	MODBUS_HOLDING_REGISTER	209	10		u8	0	60	20
 Room sensor factor climate system 1	MODBUS_HOLDING_REGISTER	210	10		u8	0	60	20
-Input AUX5	MODBUS_HOLDING_REGISTER	211	1		u8	0	68	0
-Input AUX4	MODBUS_HOLDING_REGISTER	212	1		u8	0	68	0
-Input AUX3	MODBUS_HOLDING_REGISTER	213	1		u8	0	68	0
-Input AUX2	MODBUS_HOLDING_REGISTER	214	1		u8	0	68	0
-Input AUX1	MODBUS_HOLDING_REGISTER	215	1		u8	0	68	0
-Output AUX1	MODBUS_HOLDING_REGISTER	216	1		u8	0	30	0
+Input AUX5	MODBUS_HOLDING_REGISTER	211	1		u8	0	69	0
+Input AUX4	MODBUS_HOLDING_REGISTER	212	1		u8	0	69	0
+Input AUX3	MODBUS_HOLDING_REGISTER	213	1		u8	0	69	0
+Input AUX2	MODBUS_HOLDING_REGISTER	214	1		u8	0	69	0
+Input AUX1	MODBUS_HOLDING_REGISTER	215	1		u8	0	69	0
+Output AUX1	MODBUS_HOLDING_REGISTER	216	1		u8	0	32	0
 Speed of circulation pump for hot water	MODBUS_HOLDING_REGISTER	217	1	%	u8	1	100	70
 Speed of circulation pump for heating	MODBUS_HOLDING_REGISTER	218	1	%	u8	1	100	70
 Speed, heating medium pump for pool	MODBUS_HOLDING_REGISTER	219	1	%	u8	1	100	70
@@ -915,7 +915,7 @@ id:4707	MODBUS_HOLDING_REGISTER	5276	1		u8	0	1	0
 id:4708	MODBUS_HOLDING_REGISTER	5277	1		u8	0	1	0
 id:4709	MODBUS_HOLDING_REGISTER	5278	1		u8	0	1	0
 id:4710	MODBUS_HOLDING_REGISTER	5279	1		u8	0	1	0
-Input AUX6	MODBUS_HOLDING_REGISTER	767	1		u8	0	68	0
+Input AUX6	MODBUS_HOLDING_REGISTER	767	1		u8	0	69	0
 Speed, circulation pump, standby mode (EB100)	MODBUS_HOLDING_REGISTER	842	1	%	u8	0	0	0
 Activated (Smart Price Adaption)	MODBUS_HOLDING_REGISTER	843	1		u8	0	1	0
 (SPA), heating activated (SPA)	MODBUS_HOLDING_REGISTER	844	1		u8	0	3	1
@@ -1046,29 +1046,27 @@ Speed, brine pump, standby mode (EP14)	MODBUS_HOLDING_REGISTER	1103	1	%	u8	0	100
 Smart Energy Source	MODBUS_HOLDING_REGISTER	1105	1		u8	0	1	0
 Control method, smart energy source	MODBUS_HOLDING_REGISTER	1106	1		u8	0	1	0
 El. price, special, smart energy source	MODBUS_HOLDING_REGISTER	1107	1		u8	0	2	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1108	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1108	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1109	1		u8	0	1	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1110	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1110	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1111	1		u8	0	3	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1112	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1112	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1113	1		u8	0	1	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1114	1		u16	0	10000	100
-El. price, smart energy source	MODBUS_HOLDING_REGISTER	1115	1		u8	0	1	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1116	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1114	1		u16	0	60000	100
 Prim. factor, smart energy source	MODBUS_HOLDING_REGISTER	1117	10		u8	0	50	25
 Prim. factor, shunt add. heat smart energy source	MODBUS_HOLDING_REGISTER	1118	10		u8	0	50	10
 Prim. factor, ext. step add. heat smart energy source	MODBUS_HOLDING_REGISTER	1119	10		u8	0	50	10
 Prim. factor, OPT10 smart energy source	MODBUS_HOLDING_REGISTER	1120	10		u8	0	50	10
 OPT10, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1121	1		u16	1	10000	100
 OPT10, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1122	1		u16	1	10000	100
-ext. step add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1123	1		u16	1	10000	100
-ext. step add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1124	1		u16	1	10000	100
-Shunt add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1125	1		u16	1	10000	100
-Shunt add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1126	1		u16	1	10000	100
-El. price, fixed, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1127	1		u16	1	10000	100
-El. price, fixed, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1128	1		u16	1	10000	100
-El. price, variable, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1129	1		u16	1	10000	100
-El. price, variable, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1130	1		u16	1	10000	100
+ext. step add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1123	1		u16	1	60000	100
+ext. step add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1124	1		u16	1	60000	100
+Shunt add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1125	1		u16	1	60000	100
+Shunt add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1126	1		u16	1	60000	100
+El. price, fixed, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1127	1		u16	1	60000	100
+El. price, fixed, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1128	1		u16	1	60000	100
+El. price, variable, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1129	1		u16	1	60000	100
+El. price, variable, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1130	1		u16	1	60000	100
 DM start source, priority 5 smart energy source	MODBUS_HOLDING_REGISTER	1131	1		s16	100	2000	400
 DM start source, priority 4 smart energy source	MODBUS_HOLDING_REGISTER	1132	1		s16	100	2000	400
 DM start source, priority 3 smart energy source	MODBUS_HOLDING_REGISTER	1133	1		s16	100	2000	400
@@ -1186,7 +1184,7 @@ id:7147	MODBUS_HOLDING_REGISTER	5450	1	%	u8	0	100	70
 id:7148	MODBUS_HOLDING_REGISTER	5451	1		u8	0	1	0
 id:7149	MODBUS_HOLDING_REGISTER	5452	1		u8	0	1	0
 id:7150	MODBUS_HOLDING_REGISTER	5453	1	%	u8	0	100	70
-EB103/104-GP12	MODBUS_HOLDING_REGISTER	5454	1		u8	0	1	0
+EB101/102-GP12	MODBUS_HOLDING_REGISTER	5454	1		u8	0	1	0
 id:7176	MODBUS_HOLDING_REGISTER	5455	1		u8	0	1	0
 Start time HWC period 1	MODBUS_HOLDING_REGISTER	5409	1		-	-	-	-
 Start time HWC period 2	MODBUS_HOLDING_REGISTER	5413	1		-	-	-	-
@@ -1209,10 +1207,10 @@ System 1 (RMU)	MODBUS_HOLDING_REGISTER	176	1		u8	0	1	0
 System 2 (RMU)	MODBUS_HOLDING_REGISTER	177	1		u8	0	1	0
 System 3 (RMU)	MODBUS_HOLDING_REGISTER	178	1		u8	0	1	0
 System 4 (RMU)	MODBUS_HOLDING_REGISTER	179	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	1998	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	1999	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	2000	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	2001	1		u8	0	1	0
+System 5 (RMU)	MODBUS_HOLDING_REGISTER	1998	1		u8	0	1	0
+System 6 (RMU)	MODBUS_HOLDING_REGISTER	1999	1		u8	0	1	0
+System 7 (RMU)	MODBUS_HOLDING_REGISTER	2000	1		u8	0	1	0
+System 8 (RMU)	MODBUS_HOLDING_REGISTER	2001	1		u8	0	1	0
 id:8302	MODBUS_HOLDING_REGISTER	5388	1		u8	0	1	0
 Away mode status	MODBUS_HOLDING_REGISTER	5390	1		u8	0	0	0
 The start guide has been run	MODBUS_HOLDING_REGISTER	2742	1		u8	0	1	1
@@ -1674,28 +1672,27 @@ Time between filter replacement	MODBUS_HOLDING_REGISTER	2728	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2729	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2730	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2731	1		u8	1	24	3
-AUX from Modbus	MODBUS_HOLDING_REGISTER	2740	1		u8	0	68	0
+AUX from Modbus	MODBUS_HOLDING_REGISTER	2740	1		u8	0	69	0
 AUX from Modbus	MODBUS_HOLDING_REGISTER	2741	1		s16	0	0	0
-AUX from Modbus	MODBUS_INPUT_REGISTER	2741	1		s16	0	0	0
 Instantaneous used power	MODBUS_INPUT_REGISTER	2166	1	W	u32	0	9999999	0
 Heat pump test - Silent mode (EB101/EB102)	MODBUS_HOLDING_REGISTER	5101	1		u8	0	1	0
 Permit additional heat, Pool 1	MODBUS_HOLDING_REGISTER	2760	1		u8	0	1	0
-ERS 2	MODBUS_HOLDING_REGISTER	2820	1		u8	0	1	0
-ERS 3	MODBUS_HOLDING_REGISTER	2821	1		u8	0	1	0
-ERS 4	MODBUS_HOLDING_REGISTER	2822	1		u8	0	1	0
-ERS 4	MODBUS_HOLDING_REGISTER	2823	1		u8	0	1	0
-ERS 4	MODBUS_HOLDING_REGISTER	2824	1		u8	0	1	1
-ERS 4	MODBUS_HOLDING_REGISTER	2825	1		u8	0	1	1
-ERS 4	MODBUS_HOLDING_REGISTER	2826	1		u8	0	1	1
-ERS 4	MODBUS_HOLDING_REGISTER	2827	1		u8	0	1	1
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2857	1	°C	u8	0	10	3
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2858	1	°C	u8	0	10	3
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2859	1	°C	u8	0	10	3
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2860	1	°C	u8	0	10	3
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2828	1		u8	0	2	2
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2829	1		u8	0	2	2
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2830	1		u8	0	2	2
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2831	1		u8	0	2	2
+ERS 5	MODBUS_HOLDING_REGISTER	2820	1		u8	0	1	0
+ERS 6	MODBUS_HOLDING_REGISTER	2821	1		u8	0	1	0
+ERS 7	MODBUS_HOLDING_REGISTER	2822	1		u8	0	1	0
+ERS 8	MODBUS_HOLDING_REGISTER	2823	1		u8	0	1	0
+ERS 5	MODBUS_HOLDING_REGISTER	2824	1		u8	0	1	1
+ERS 6	MODBUS_HOLDING_REGISTER	2825	1		u8	0	1	1
+ERS 7	MODBUS_HOLDING_REGISTER	2826	1		u8	0	1	1
+ERS 8	MODBUS_HOLDING_REGISTER	2827	1		u8	0	1	1
+Min. vent temp. (ERS 5)	MODBUS_HOLDING_REGISTER	2857	1	°C	u8	0	10	3
+Min. vent temp. (ERS 6)	MODBUS_HOLDING_REGISTER	2858	1	°C	u8	0	10	3
+Min. vent temp. (ERS 7)	MODBUS_HOLDING_REGISTER	2859	1	°C	u8	0	10	3
+Min. vent temp. (ERS 8)	MODBUS_HOLDING_REGISTER	2860	1	°C	u8	0	10	3
+Blocking actions (ERS 5)	MODBUS_HOLDING_REGISTER	2828	1		u8	0	2	2
+Blocking actions (ERS 6)	MODBUS_HOLDING_REGISTER	2829	1		u8	0	2	2
+Blocking actions (ERS 7)	MODBUS_HOLDING_REGISTER	2830	1		u8	0	2	2
+Blocking actions (ERS 8)	MODBUS_HOLDING_REGISTER	2831	1		u8	0	2	2
 id:23145	MODBUS_HOLDING_REGISTER	2921	1		u8	0	1	0
 id:23146	MODBUS_HOLDING_REGISTER	2922	1		u8	0	1	0
 id:23147	MODBUS_HOLDING_REGISTER	2923	1		u8	0	1	0
@@ -1715,7 +1712,7 @@ Fan mode 8	MODBUS_INPUT_REGISTER	2171	1	%	u8	0	0	0
 Status	MODBUS_INPUT_REGISTER	3812	1		u8	0	0	0
 Disable emergency restart GP1	MODBUS_HOLDING_REGISTER	5392	1		u8	0	1	0
 Disable emergency restart GP1	MODBUS_HOLDING_REGISTER	5025	1		u8	0	1	0
-Modbus external control	MODBUS_HOLDING_REGISTER	5008	1		u8	0	1	0
+Modbus use ext. calc supply	MODBUS_HOLDING_REGISTER	5008	1		u8	0	1	0
 id:24484	MODBUS_HOLDING_REGISTER	5009	10	°C	s16	50	800	450
 id:24485	MODBUS_HOLDING_REGISTER	5010	10	°C	s16	50	800	450
 id:24486	MODBUS_HOLDING_REGISTER	5011	10	°C	s16	50	800	450
@@ -1759,8 +1756,8 @@ Energy log - Used energy for pool over the past hour	MODBUS_INPUT_REGISTER	2295
 Energy log - Used energy by additional heater for heating over the past hour	MODBUS_INPUT_REGISTER	2299	100	kWh	u32	0	0	0
 Energy log - Used energy by additional heater for hot water over the past hour	MODBUS_INPUT_REGISTER	2301	100	kWh	u32	0	0	0
 Energy log - Used energy by additional heater for pool over the past hour	MODBUS_INPUT_REGISTER	2303	100	kWh	u32	0	0	0
-Energy log - Current power consumption	MODBUS_INPUT_REGISTER	2305	100	kWh	u32	0	0	0
-Energy log - Current power consumption, components	MODBUS_INPUT_REGISTER	2408	100	kWh	u32	0	0	0
+Energy log - Current power consumption	MODBUS_INPUT_REGISTER	2305	100	kW	u32	0	0	0
+Energy log - Current power consumption, components	MODBUS_INPUT_REGISTER	2408	100	kW	u32	0	0	0
 Compressor, total time energy storage, main unit (EP14)	MODBUS_INPUT_REGISTER	2335	1	h	u32	0	2147483647	0
 Compressor, total time energy storage, main unit (EP15)	MODBUS_INPUT_REGISTER	2337	1	h	u32	0	2147483647	0
 Compressor, total time energy storage, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	2339	1	h	u32	0	2147483647	0
@@ -2140,7 +2137,7 @@ id:28592	MODBUS_HOLDING_REGISTER	5976	1		s32	-10000	10000	100
 id:28593	MODBUS_HOLDING_REGISTER	5978	1		s32	-10000	10000	100
 id:28594	MODBUS_HOLDING_REGISTER	5980	1		s32	-10000	10000	100
 id:28595	MODBUS_HOLDING_REGISTER	5982	1		s32	-10000	10000	100
-id:29258	MODBUS_HOLDING_REGISTER	5984	1	kW	u16	0	65535	0
+Production (PV Power)	MODBUS_HOLDING_REGISTER	5984	1	kW	u16	0	65535	0
 Current power	MODBUS_INPUT_REGISTER	2727	100	kW	u32	0	0	0
 id:29292	MODBUS_HOLDING_REGISTER	5985	1		s16	0	20	0
 External reading of BT50 activated	MODBUS_HOLDING_REGISTER	5986	1		u8	0	1	0
@@ -2192,9 +2189,9 @@ Temperature: THS10 2	MODBUS_INPUT_REGISTER	2804	10	°C	s32	0	0	0
 Humidity: HTS 1	MODBUS_INPUT_REGISTER	3130	10	%RH	s32	0	0	0
 Humidity: THS10 1	MODBUS_INPUT_REGISTER	3132	10	%RH	s32	0	0	0
 Humidity: THS10 2	MODBUS_INPUT_REGISTER	3134	10	%RH	s32	0	0	0
-Input AUX7	MODBUS_HOLDING_REGISTER	1555	1		u8	0	68	0
-Input AUX8	MODBUS_HOLDING_REGISTER	1556	1		u8	0	68	0
-Input AUX9	MODBUS_HOLDING_REGISTER	1557	1		u8	0	68	0
+Input AUX7	MODBUS_HOLDING_REGISTER	1555	1		u8	0	69	0
+Input AUX8	MODBUS_HOLDING_REGISTER	1556	1		u8	0	69	0
+Input AUX9	MODBUS_HOLDING_REGISTER	1557	1		u8	0	69	0
 id:55076	MODBUS_HOLDING_REGISTER	2877	1		u8	0	1	0
 id:55077	MODBUS_HOLDING_REGISTER	2878	1		u8	0	1	0
 id:55078	MODBUS_HOLDING_REGISTER	2879	1		u8	0	1	0
@@ -2203,6 +2200,7 @@ id:55080	MODBUS_HOLDING_REGISTER	2881	1		u8	0	1	0
 id:55081	MODBUS_HOLDING_REGISTER	2882	1		u8	0	1	0
 id:55082	MODBUS_HOLDING_REGISTER	2883	1		u8	0	1	0
 id:55083	MODBUS_HOLDING_REGISTER	2884	1		u8	0	1	0
+Power limitation activation	MODBUS_HOLDING_REGISTER	6012	1		u8	0	1	0
 External reading of BT68 activated	MODBUS_HOLDING_REGISTER	6003	1		u8	0	1	0
 External reading of value BT68	MODBUS_HOLDING_REGISTER	6004	10	°C	s16	0	0	0
 External reading of BT69 activated	MODBUS_HOLDING_REGISTER	6005	1		u8	0	1	0
diff --git a/nibe/data/s1156_s1256.json b/nibe/data/s1156_s1256.json
index 6b542c7..c149597 100644
--- a/nibe/data/s1156_s1256.json
+++ b/nibe/data/s1156_s1256.json
@@ -70,7 +70,7 @@
     "name": "brine-out-bt11-30012"
   },
   "30013": {
-    "title": "Condenser sensor, supply line (BT12)",
+    "title": "Condenser sensor supply line (BT12)",
     "factor": 10,
     "unit": "\u00b0C",
     "size": "s16",
@@ -917,14 +917,14 @@
     "name": "compressor-total-time-pool-2-heat-pump-1-ep14-30272"
   },
   "30280": {
-    "title": "Compressor, total time cooling, main unit (EP14)",
+    "title": "Total run time compressor cooling",
     "factor": 1,
     "unit": "h",
     "size": "u32",
     "min": 0.0,
     "max": 2147483647.0,
     "default": 0.0,
-    "name": "compressor-total-time-cooling-main-unit-ep14-30280"
+    "name": "total-run-time-compressor-cooling-30280"
   },
   "30282": {
     "title": "Compressor, total time pool, main unit (EP14)",
@@ -3148,10 +3148,10 @@
     "name": "fan-mode-1-31038"
   },
   "31039": {
-    "title": "Current hot water mode",
+    "title": "Current hot water mode without SPA/SC",
     "factor": 1,
     "size": "s8",
-    "name": "current-hot-water-mode-31039"
+    "name": "current-hot-water-mode-without-spa-sc-31039"
   },
   "31042": {
     "title": "Min frequency compressor",
@@ -4495,11 +4495,11 @@
     "name": "low-press-sensor-unprocessed-eb100-ep15-31906"
   },
   "31907": {
-    "title": "Current sensor (EB100-EP15)",
+    "title": "Current (EB100-EP15)",
     "factor": 10,
     "unit": "A",
     "size": "s16",
-    "name": "current-sensor-eb100-ep15-31907"
+    "name": "current-eb100-ep15-31907"
   },
   "31909": {
     "title": "Low press. sensor, unprocessed (EB100-EP14)",
@@ -4508,11 +4508,11 @@
     "name": "low-press-sensor-unprocessed-eb100-ep14-31909"
   },
   "31910": {
-    "title": "Current sensor (EB100-EP14)",
+    "title": "Current (EB100-EP14)",
     "factor": 10,
     "unit": "A",
     "size": "s16",
-    "name": "current-sensor-eb100-ep14-31910"
+    "name": "current-eb100-ep14-31910"
   },
   "31912": {
     "title": "Operating mode (SG Ready)",
@@ -4539,10 +4539,10 @@
     "name": "sg-ready-input-b-31914"
   },
   "31916": {
-    "title": "Hot water comfort mode (SPA)",
+    "title": "Hot water mode (SPA)",
     "factor": 1,
     "size": "s8",
-    "name": "hot-water-comfort-mode-spa-31916"
+    "name": "hot-water-mode-spa-31916"
   },
   "31917": {
     "title": "Pool offset (SPA)",
@@ -4859,13 +4859,13 @@
     "write": true
   },
   "40057": {
-    "title": "Hot water demand mode",
+    "title": "Hot water mode",
     "factor": 1,
     "size": "s8",
     "min": 0.0,
     "max": 4.0,
     "default": 1.0,
-    "name": "hot-water-demand-mode-40057",
+    "name": "hot-water-mode-40057",
     "write": true,
     "mappings": {
       "0": "Small",
@@ -5131,7 +5131,7 @@
     "size": "u16",
     "min": 1.0,
     "max": 400.0,
-    "default": 25.0,
+    "default": 16.0,
     "name": "fuse-40104",
     "write": true
   },
@@ -6028,7 +6028,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux5-40212",
     "write": true
@@ -6038,7 +6038,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux4-40213",
     "write": true
@@ -6048,7 +6048,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux3-40214",
     "write": true
@@ -6058,7 +6058,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux2-40215",
     "write": true
@@ -6068,7 +6068,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux1-40216",
     "write": true
@@ -6078,7 +6078,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 30.0,
+    "max": 32.0,
     "default": 0.0,
     "name": "output-aux1-40217",
     "write": true
@@ -6606,7 +6606,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux6-40768",
     "write": true
@@ -7916,7 +7916,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41109",
     "write": true
@@ -7936,7 +7936,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41111",
     "write": true
@@ -7956,7 +7956,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41113",
     "write": true
@@ -7976,31 +7976,11 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41115",
     "write": true
   },
-  "41116": {
-    "title": "El. price, smart energy source",
-    "factor": 1,
-    "size": "u8",
-    "min": 0.0,
-    "max": 1.0,
-    "default": 0.0,
-    "name": "el-price-smart-energy-source-41116",
-    "write": true
-  },
-  "41117": {
-    "title": "El. price, fixed, smart energy source",
-    "factor": 1,
-    "size": "u16",
-    "min": 0.0,
-    "max": 10000.0,
-    "default": 100.0,
-    "name": "el-price-fixed-smart-energy-source-41117",
-    "write": true
-  },
   "41118": {
     "title": "Prim. factor, smart energy source",
     "factor": 10,
@@ -8066,7 +8046,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "ext-step-add-heat-high-tariff-price-smart-energy-source-41124",
     "write": true
@@ -8076,7 +8056,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "ext-step-add-heat-low-tariff-price-smart-energy-source-41125",
     "write": true
@@ -8086,7 +8066,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "shunt-add-heat-high-tariff-price-smart-energy-source-41126",
     "write": true
@@ -8096,7 +8076,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "shunt-add-heat-low-tariff-price-smart-energy-source-41127",
     "write": true
@@ -8106,7 +8086,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-high-tariff-smart-energy-source-41128",
     "write": true
@@ -8116,7 +8096,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-low-tariff-smart-energy-source-41129",
     "write": true
@@ -8126,7 +8106,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-variable-high-tariff-smart-energy-source-41130",
     "write": true
@@ -8136,7 +8116,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-variable-low-tariff-smart-energy-source-41131",
     "write": true
@@ -8971,13 +8951,13 @@
     "name": "evaporator-bt84-32130"
   },
   "45455": {
-    "title": "EB103/104-GP12",
+    "title": "EB101/102-GP12",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "eb103-104-gp12-45455",
+    "name": "eb101-102-gp12-45455",
     "write": true
   },
   "45410": {
@@ -9095,43 +9075,43 @@
     "write": true
   },
   "41999": {
-    "title": "System 4 (RMU)",
+    "title": "System 5 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-41999",
+    "name": "system-5-rmu-41999",
     "write": true
   },
   "42000": {
-    "title": "System 4 (RMU)",
+    "title": "System 6 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-42000",
+    "name": "system-6-rmu-42000",
     "write": true
   },
   "42001": {
-    "title": "System 4 (RMU)",
+    "title": "System 7 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-42001",
+    "name": "system-7-rmu-42001",
     "write": true
   },
   "42002": {
-    "title": "System 4 (RMU)",
+    "title": "System 8 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-42002",
+    "name": "system-8-rmu-42002",
     "write": true
   },
   "45391": {
@@ -10797,7 +10777,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "aux-from-modbus-42741",
     "write": true
@@ -10809,12 +10789,6 @@
     "name": "aux-from-modbus-42742",
     "write": true
   },
-  "32742": {
-    "title": "AUX from Modbus",
-    "factor": 1,
-    "size": "s16",
-    "name": "aux-from-modbus-32742"
-  },
   "32167": {
     "title": "Instantaneous used power",
     "factor": 1,
@@ -10846,167 +10820,167 @@
     "write": true
   },
   "42821": {
-    "title": "ERS 2",
+    "title": "ERS 5",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-2-42821",
+    "name": "ers-5-42821",
     "write": true
   },
   "42822": {
-    "title": "ERS 3",
+    "title": "ERS 6",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-3-42822",
+    "name": "ers-6-42822",
     "write": true
   },
   "42823": {
-    "title": "ERS 4",
+    "title": "ERS 7",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-4-42823",
+    "name": "ers-7-42823",
     "write": true
   },
   "42824": {
-    "title": "ERS 4",
+    "title": "ERS 8",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-4-42824",
+    "name": "ers-8-42824",
     "write": true
   },
   "42825": {
-    "title": "ERS 4",
+    "title": "ERS 5",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42825",
+    "name": "ers-5-42825",
     "write": true
   },
   "42826": {
-    "title": "ERS 4",
+    "title": "ERS 6",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42826",
+    "name": "ers-6-42826",
     "write": true
   },
   "42827": {
-    "title": "ERS 4",
+    "title": "ERS 7",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42827",
+    "name": "ers-7-42827",
     "write": true
   },
   "42828": {
-    "title": "ERS 4",
+    "title": "ERS 8",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42828",
+    "name": "ers-8-42828",
     "write": true
   },
   "42858": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 5)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42858",
+    "name": "min-vent-temp-ers-5-42858",
     "write": true
   },
   "42859": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 6)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42859",
+    "name": "min-vent-temp-ers-6-42859",
     "write": true
   },
   "42860": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 7)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42860",
+    "name": "min-vent-temp-ers-7-42860",
     "write": true
   },
   "42861": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 8)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42861",
+    "name": "min-vent-temp-ers-8-42861",
     "write": true
   },
   "42829": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 5)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42829",
+    "name": "blocking-actions-ers-5-42829",
     "write": true
   },
   "42830": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 6)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42830",
+    "name": "blocking-actions-ers-6-42830",
     "write": true
   },
   "42831": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 7)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42831",
+    "name": "blocking-actions-ers-7-42831",
     "write": true
   },
   "42832": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 8)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42832",
+    "name": "blocking-actions-ers-8-42832",
     "write": true
   },
   "32169": {
@@ -11064,13 +11038,13 @@
     "write": true
   },
   "45009": {
-    "title": "Modbus external control",
+    "title": "Modbus use ext. calc supply",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "modbus-external-control-45009",
+    "name": "modbus-use-ext-calc-supply-45009",
     "write": true
   },
   "32284": {
@@ -11554,6 +11528,17 @@
     "size": "s16",
     "name": "boiler-temperature-bt52-33801"
   },
+  "45985": {
+    "title": "Production (PV Power)",
+    "factor": 1,
+    "unit": "kW",
+    "size": "u16",
+    "min": 0.0,
+    "max": 65535.0,
+    "default": 0.0,
+    "name": "production-pv-power-45985",
+    "write": true
+  },
   "32728": {
     "title": "Current power",
     "factor": 100,
@@ -11634,7 +11619,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux7-41556",
     "write": true
@@ -11644,7 +11629,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux8-41557",
     "write": true
@@ -11654,11 +11639,21 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux9-41558",
     "write": true
   },
+  "46013": {
+    "title": "Power limitation activation",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 1.0,
+    "default": 0.0,
+    "name": "power-limitation-activation-46013",
+    "write": true
+  },
   "46004": {
     "title": "External reading of BT68 activated",
     "factor": 1,