diff --git a/ChangeLog.md b/ChangeLog.md
index b6c03f92..ae8ab873 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,20 @@
-# 2018-12-25
+# 2021-02-20
+* made vaillant/broadcast vdatetime writable to installer
+* added value 4=hwc to vaillant pumpstate
+* added hcname3 to vaillant/15.uih
+* added vaillant/15.720 and 15.basv
+* added vaillant/06.vms
+* added mctype7 value 6=circulation to vaillant templates
 
-* added heating circuit 3 and zone 3 to vaillant/15.700 and corrected english names
+# 2021-02-07
+* added vaillant/08.bai 0010021961 with variants
+* added vaillant/15.b7v
+* added cooling temp, fuel sum, energy sum for vaillant/15.700
+* added another vaillant/08.bai 0010015600 variant: 0010014917
+* added another temp for vaillant/50.v61.mc
+
+# 2019-10-06
+* added vaillant/f35
 
+# 2018-12-25
+* added heating circuit 3 and zone 3 to vaillant/15.700 and corrected english names
diff --git a/README.md b/README.md
index c3077ba9..203fd417 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,13 @@ provided here and you should definitely know what you're doing.
 Usage with ebusd version 3.2 or higher
 --------------------------------------
 
-If you're using [ebusd in version 3.2](https://github.com/john30/ebusd/tree/v3.2) or higher, you can simply use the default option for the location of the configuration files that are served by ebusd.eu (see ["--configpath" option](https://github.com/john30/ebusd/wiki/2.-Run#message-configuration-options)).
-Due to this new feature, no more packaged releases of this repository will be generated in future. If you intend to work on the configuration yourself, simply checkout this repository and point ebusd to your local folder with the latest version.  
-The current status of and latest changes to the files on ebusd.eu are stated in the [ChangeLog](https://github.com/john30/ebusd-configuration/blob/master/ChangeLog.md).
+If you're using [ebusd in version 3.2](https://github.com/john30/ebusd/tree/v3.2) or higher, you can simply use the default option for the location of the configuration files that are served by ebusd.eu (see ["--configpath" option](https://github.com/john30/ebusd/wiki/2.-Run#message-configuration-options)).  
+
+**Note**: Only the files linked to by the [`latest`](https://github.com/john30/ebusd-configuration/blob/master/latest) folder are served there for the time being.  
+
+Due to this new feature, no more packaged releases of this repository will be generated in future. If you intend to work on the configuration yourself, simply checkout this repository and point ebusd to your local folder with the latest version.
+
+The current status of and latest changes to the files on ebusd.eu (as linked to by the [`latest`](https://github.com/john30/ebusd-configuration/blob/master/latest) folder) are stated in the [ChangeLog](https://github.com/john30/ebusd-configuration/blob/master/ChangeLog.md).
 
 
 Installation on up-to-date ebusd (2.0 or higher)
diff --git a/ebusd-1.x.x/vaillant_de/common.csv b/ebusd-1.x.x/vaillant_de/common.csv
index a4ee1356..85e62dca 100644
--- a/ebusd-1.x.x/vaillant_de/common.csv
+++ b/ebusd-1.x.x/vaillant_de/common.csv
@@ -16,7 +16,7 @@ rw;rc,,Mode,Betriebsart,,,,01,,,temp0;hwcmode;IGN:2;HEX;IGN;onoff;IGN,,,
 rm;rm4;rm5,,Mode,Betriebsart,,,,01,,,temp0;mcmode;IGN:2;HEX;IGN;onoff;IGN,,,
 h,,Mode,Betriebsart,,,B510,00,mode,,UCH,0=off;1=standby;2=heat;3=water,,
 h,,Status,Status,,,,03,,,temp;press;press;HEX:4,,,
-h,,Status01,VL/RL/AussenTemp/VLWW/SpeicherTemp/Status,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
+h,,Status01,VL/RL/AußenTemp/VLWW/SpeicherTemp/Status,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
 h,,Status02,Mode/maxTemp/ReglerCurrentTEMP/maxTemp/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
 rw;rc;rm;rm4;rm5,,Status,Status,,,,0D,,,temp0;onoff;temp;temp0,,,
 rw;rc;rm;rm4;rm5,,Timer.Monday,Zeitfenster Montag,,,,02,,,slot1-3;daysel,,,
diff --git a/ebusd-2.1.x/de/vaillant/06.vms.csv b/ebusd-2.1.x/de/vaillant/06.vms.csv
new file mode 100755
index 00000000..bafd679f
--- /dev/null
+++ b/ebusd-2.1.x/de/vaillant/06.vms.csv
@@ -0,0 +1,41 @@
+# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
+#,VMS01,VMS01,0020071488 243,,,,,,,,,,
+*r,,,,,,"B509","0D",,,,,,
+*w,,,,,,"B509","0E",,,,,,
+*wi,#install,,,,,"B509","0E",,,,,,
+# ##### Generell #####,,,,,,,,,,,,,
+r,,Ntc1Sensor,NTC 1 Sensor,,,,"0500",,,tempsensor,,,Temperature in solar flow (from solar collector)
+r,,Ntc2Sensor,NTC 2 Sensor,,,,"0600",,,tempsensor,,,Temperature in solar back flow (to solar collector)
+r;wi,,SolPumpRelay,Relais Solarpumpe,,,,"0F00",,,onoff,,,Solar pump relay: 0: OFF; 1: ON
+r;wi,,SolPumpPower,Leistung Solarpumpe,,,,"1000",,,power,,,Performance of solar pump: (7 - 100 %)
+r;wi,,BufferPumpPower,Leistung Pufferpumpe,,,,"1100",,,power,,,Performance of buffer pump: (15 - 100%)
+r,,MonitorMatlabLast5minSolAverage,MonitorMatlab_Last5minSolarAverage,,,,"1700",,,SIN,,,
+r,,CurrentVPMLoadingMode,Aktuelle Betriebsart,,,,"1900",,,UCH,,,1 = Warmwasser (autonom)2 = Heizung (autonom)3 = +10K (autonom)4 = Schwimmbad5 = Warmwasser6 = Heizung7 = +10K
+r,,RunTimePump1Minutes,Laufzeit Pumpe 1,,,,"1A00",,,minutes0,,,Laufzeit der Solarpumpe (Minuten Anteil)
+r,,RunTimePump1Hours,Laufzeit Pumpe 1,,,,"1B00",,,hoursum2,,,Laufzeit der Solarpumpe (Stunden Anteil)
+r,,ExternalHwcRequest,Externe Warmwasseranforderung,,,,"1C00",,,onoff,,,0: No request; 1: Request
+r,,ExternalHcRequest,Externe Heizungsanforderung,,,,"1D00",,,onoff,,,0: No request; 1: Request
+r,,ExternalHwcTempDesired,Externer Warmwassersollwert,,,,"1E00",,,desiredtemp,,,Requested temperature for DHW
+r,,ExternalHcTempDesired,Externer Heizungssollwert,,,,"1F00",,,desiredtemp,,,Requested temperature for CH
+r,,CurrentASCStateforExternals,CurrentASCStateforExternals,,,,"2000",,,UCH,,,1:OFF 2: Proofing 3:DHWLoading 4:CHLoading 5:Overtemperature
+r,,CurrentASCStateforASI,CurrentASCStateforASI,,,,"2100",,,UCH,,,1: Standby 2:Proofing 3:StorageLoading 4:Error_System_blocked
+r,,DateAndTimeIsSet,DateAndTimeIsSet,,,,"2200",,,onoff,,,0: Date and Time is not set; 1: Date and Time is set
+r;wi,,Time,Zeit,,,,"2300",,,time,,,
+r;wi,,Date,Datum,,,,"2400",,,date,,,
+r,,FlowSensorFrequency,FlowSensorFrequency,,,,"2D00",,,UIN,,,
+r,,CurrentFlow,Volumenstrom,,,,"2E00",,,UIN,,ml / min,Flow thru buffer circuit if loading the storage
+r,,Variante,Variante,,,,"3000",,,UCH,,,1: VMS 302: VPM 20 S3: VPM 60 S
+r,,CurrentSystemMode,Aktueller Systemmodus,,,,"3300",,,UCH,,,1 : Autonomer Modus3 : Regler Modus
+r,,InternalHwcTempDesired,InternalDHWSetpoint,,,,"3500",,,UCH,,,Temperature target for DHW loading if solar module is in stand alone appliccation without external control
+r,,InternalHcTempDesired,InternalCHSetpoint,,,,"3600",,,UCH,,,Temperature target for CW loading if solar module is in stand alone appliccation without external control
+r,,ASIDetected,ASIDetected,,,,"3800",,,onoff,,,
+r;wi,,CountryZone,Land,,,,"3900",,,UCH,,,Standort der für den Sonnenkalender herangezogen wird. Siehe Anleitung
+r,,RequestForExternalDateTimeSetting,Status Datum/Uhrzeit,,,,"3A00",,,onoff,,,0: Time and Date is set; 1: Time and Date is not set
+r;wi,,YieldCurrentDay,Heutiger Solarertrag,,,,"3B00",,,energy,,,Accumulated solar gain from 00:00 to 24:00 if time is set
+r,,ForceStartSolPumpKick,Pumpenkick erzwingen,,,,"4700",,,onoff,,,Startet die Kollektorpumpe für maximal 5 Minuten um die Kollektortemperatur zu überprüfen.0 = aus1 = ein
+r,,MonitorMatlabState,MonitorMatlabState,,,,"4800",,,UCH,,,main states: 201: Waiting; 209: Loading; 41: Night Modus
+r,,RunTimeBufferPumpMinutes,Laufzeit Pufferpumpe,,,,"4B00",,,minutes0,,,Laufzeit der Pufferpumpe (Minuten Anteil)
+r,,RunTimeBufferPumpHours,Laufzeit Pufferpumpe,,,,"4C00",,,hoursum2,,,Laufzeit der Pufferpumpe (Stunden Anteil)
+r,,MonitorOverheatState,MonitorOverheatState,,,,"4F00",,,UCH,,,111: Waiting; 112 and 113: Temperature to high; 220 and 221: In Overheat protection
+r;wi,,YieldTotal,Solarertrag gesamt,,,,"5600",,,energy4,,,Kumulierter Solarertrag seit Installation
+!include,errors.inc,,,,,,,,,,,,
diff --git a/ebusd-2.1.x/de/vaillant/08.hmu.csv b/ebusd-2.1.x/de/vaillant/08.hmu.csv
index b4eb2ffc..ffd73286 100644
--- a/ebusd-2.1.x/de/vaillant/08.hmu.csv
+++ b/ebusd-2.1.x/de/vaillant/08.hmu.csv
@@ -1,13 +1,58 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment
+
+# Werte von Fachhandwerkerebene -> Testmenü -> Statistiken
+*r,,,,,,"B51A","05b434",,,IGN:3,,,,
+r,,CompressorHours,Kompressor Sunden,,,B51A,05b43400,,,hoursum,,,Kompressor Stunden
+r,,CompressorStarts,Kompressor Starts,,,B51A,05b43401,,,UIN,,,Kompressor Starts
+r,,BuildingPumpHours,Gebäudepumpe Stunden,,,B51A,05b43402,,,hoursum,,,Gebäudepumpe Stunden
+r,,BuildingPumpStarts,Gebäudepumpe Starts,,,B51A,05b43403,,,UIN,,,Gebäudepumpe Starts
+r,,FourWayValveHours,4-Wege-V. Std.,,,B51A,05073406,,,hoursum,,,4-Wege Ventil Stunden
+r,,FourWayValveSwitchingOperations,4-Wege Schaltv.,,,B51A,05363407,,,UIN,,,Schaltvorgänge 4-Wege Ventil
+r,,Fan1Hours,Betr.std.Lüfter 1,,,B51A,053c3451,,,hoursum,,,Betriebsstunden Lüfter 1
+r,,Fan1Starts,Starts Lüfter 1,,,B51A,05d63452,,,UIN,,,Starts Lüfter 1
+r,,EEVSteps,EEV Schritte,,,B51A,05e4340d,,,UIN,,,EEV Schritte
+r,,stat5,stat1,,,B51A,05b43404,,,UIN,,,comment
+
 *r,,,,,,"B511",,,,,,,
-r,,State,,,,,07,energy,,UCH,,,,,,energy,,kWh,,onoff,,UCH,0=off;1=on,,,state,,UCH,0x01=ready;0x0b=error;0x09=heating;0x11=cooling;0x81=heating_water,,
+r,,State,,,,,07,field1,,UCH,,,,,,energy,10,kWh,Täglicher Energieertrag,onoff,,UCH,0=off;1=on,,,state,,UCH,0x00=ready;0x01=ready;0x0b=error;0x08=heating;0x09=heating;0x11=cooling;0x80=heating_water;0x81=heating_water,,
+
 # Heatpump statistics
 *r,,,,,,"B51A","05FF32",,,IGN:3,,,,
-r,,EnergyHc,,,,,00,,,energy,,,,,,,,,,,,,,,
+r,,EnergyHc,Energieertrag Tag Heizen,,,,00,,,energy,10,,,,,,,,,,,,,,
 r,,EnergyCool,,,,,01,,,energy,,,,,,,,,,,,,,,
-r,,Hours,,,,,40,,,energy,,,,,,,,,,,,,,,
-r,,HoursHc,,,,,41,,,energy,,,,,,,,,,,,,,,
-r,,HoursCool,,,,,43,,,energy,,,,,,,,,,,,,,,
+r,,F02,F02,,,,02,f02,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F03,F03,,,,03,f03,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F04,F04,,,,04,f04,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F05,F05,,,,05,f05,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F06,F06,,,,06,f06,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F07,F07,,,,07,f07,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F08,F08,,,,08,f08,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F09,F09,,,,09,f09,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,F10,F10,,,,10,f10,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,F11,F11,,,,11,f11,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,F12,F12,,,,12,f12,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,F13,F13,,,,13,f13,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F14,F14,,,,14,f14,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F15,F15,,,,15,f15,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,EnergyYieldHwc,Energieertrag gesamt Warmwasser,,,,16,energyyieldhwc,,ULG,,kWh,,,,,,,,,,,,,,,,,,,
+r,,F17,F17,,,,17,f17,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F18,F18,,,,18,f18,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F19,F19,,,,19,f19,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,F20,F20,,,,20,f20,,D2B,,,,,,,,,,,,,,,,,,,,,
+r,,EnergyIntegral,Energie Integral,,,,21,energyintegral,,SLG,,°min,,,,,,,,,,,,,,,,,
+#r,,F22,F22,,,,22,f22,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,CurrentYieldPower,Kälteleistung,,,,23,yieldpower,,D1B,10,kW,,,,,,,,,,,,,,,,,,,
+r,,CurrentConsumedPower,elektrische Leistungsaufnahme,,,,24,consumedpower,,D1B,10,kW,,,,,,,,,,,,,,,,,,,
+r,,CurrentCompressorUtil,Modulation Kompressor,,,,25,compressorutil,,D2C,,%,,,,,,,,,,,,,,,,,,,
+r,,AirInletTemp,Lufteinlasstemperatur,,,,26,airinlettemp,,temp,,,,,,,,,,,,,,,,,,,,,
+#r,,F27,F27,,,,27,f27,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F28,F28,,,,28,f28,,D1B,,,,,,,,,,,,,,,,,,,,,
+#r,,F29,F29,,,,29,f29,,D1B,,,,,,,,,,,,,,,,,,,,,
+r,,Hours,Betriebsstd. Gesamt,,,,40,,,hoursum,,,,,,,,,,,,,,,
+r,,HoursHc,Betriebsstd. Heizen,,,,41,,,hoursum,,,,,,,,,,,,,,,
+r,,HoursCool,Betriebsstd. Kühlen,,,,43,,,hoursum,,,,,,,,,,,,,,,
+
+
 # Total heating yields
 *r,,,,,,"B516","18",,,IGN:1,,,
 r,,YieldTotal,,,,,01,,,energy,,,,,,,,,,,,,,,
@@ -41,6 +86,51 @@ r,,ConsumptionThisYear9,,,,,0900,month,,D1B,,,,,,IGN:1,,,,,,energy,,,
 r,,ConsumptionThisYear10,,,,,0A00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,
 r,,ConsumptionThisYear11,,,,,0B00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,
 r,,ConsumptionThisYear12,,,,,0C00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,
-!include,hcmode.inc,,,,,,,,,,,,
-!include,errors.inc,,,,,,,,,,,,
 
+# Werte von Fachhandwerkerebene -> Testmenü -> Sensor-/Aktortest
+*r,,,,,,B514,05,,,IGN:2,,,,,,,,,,,,,,,,,,,,,
+r,,BuildingCircuitPumpPower,Gebäudekreispumpe Leistung,,,,0103ffff,,,UIN,,%,T.0.01 Gebäudekreispumpe Leistung
+r,,Fan1,Lüfter 1,,,,1103ffff,,,UIN,,%,T.0.02 Lüfter 1
+r,,CondensateTrayHeater,Kondensatwannenheizung,,,,1303ffff,,,UIN,0=aus;1=an,,T.0.19 Kondensatwannenheizung
+r,,FourPortValve,Vierwegeventil,,,,1403ffff,,,UIN,0=aus;1=an,,T.0.20 4-Wege-Ventil
+r,,PositionEEV,Position EEV,,,,1503ffff,,,UIN,,%,T.0.21 Position: EEV
+r,,HeatingCoilCompressor,Heizwendel Kompressor,,,,1703ffff,,,UIN,0=aus;1=an,,T.0.23 Heizwendel Kompressor
+r,,FlowTemp,Vorlauftemperatur,,,,2803ffff,,,SIN,10,°C,T.0.40 Vorlauftemperatur
+r,,ReturnTemp,Rücklauftemperatur,,,,2903ffff,,,SIN,10,°C,T.0.41 Rücklauftemperatur
+r,,CircuitBuildingWaterPressure,Gebäudekreis Druck,,,,2a03ffff,,,UIN,10,bar,T.0.42 Gebäudekreis: Druck
+r,,CircuitBuildingFlowRate,Gebäudekreis Durchfluss,,,,2B03ffff,,,UIN,,l/h,T.0.45 Gebäudekreis: Durchfluss
+r,,AirInletTempSens,Lufteinlasstemp.,,,,3003ffff,,,SIN,10,°C,T.0.48 Lufteinlasstemperatur
+r,,CompressorOutletTemp,Kompressorauslasstemperatur,,,,3703ffff,,,SIN,10,°C,T.0.55 Kompressorauslastemperatur
+r,,CompressorInletTemp,Kompressoreinlasstemperatur,,,,3803ffff,,,SIN,10,°C,T.0.56 Kompressoreinlastemperatur
+r,,EEVOutletTemp,EEV Auslass Tempperatur,,,,3903ffff,,,SIN,10,°C,T.0.57 Temperatur EEV Auslass
+r,,CondenserOutletTemp,Temperatur Kondensatorauslass,,,,3b03ffff,,,SIN,10,°C,T.0.59 Temperatur Kondensatorauslass
+r,,HighPressure,Hochdruck,,,,3f03ffff,,,SIN,10,bar,T.0.63 Hochdruck
+r,,LowPressure,Niederdruck,,,,4003ffff,,,SIN,10,bar,T.0.64 Niederdruck
+r,,HighPressureSwitch,Hochdruckschalter,,,,4303ffff,,,UIN,0=offen;1=geschlossen,,T.0.67 Hochdruckschalter
+r,,EvaporationTemp,Verdampfungstemperatur,,,,5503ffff,,,SIN,10,°C,T.0.85 Verdampfungstemperatur
+r,,CondensationTemp,Kondensationstemperatur,,,,5603ffff,,,SIN,10,°C,T.0.86 Kondensationstemperatur
+r,,OverheatingTargetValue,Sollwert Überhitzung,,,,5703ffff,,,SIN,10,K,T.0.87 Sollwert Überhitzung
+r,,OverheatingActualValue,Istwert Überhitzung,,,,5803ffff,,,SIN,10,K,T.0.88 Istwert Überhitzung
+r,,SubcoolingTargetValue,Sollwert Unterkühlung,,,,5903ffff,,,SIN,10,K,T.0.89 Sollwert Unterkühlung
+r,,SubcoolingActualValue,Istwert Unterkühlung,,,,5a03ffff,,,SIN,10,K,T.0.90 Istwert Unterkühlung
+r,,CompressorSpeed,Kompressor Drehzahl,,,,5d03ffff,,,SIN,10,U/s,T.0.93 Kompressor Drehzahl
+r,,TempSwitchCompressorOutlet,Temperaturschalter Kompressor Auslass,,,,7b03ffff,,,UIN,0=offen;1=geschlossen,,T.0.123 Temperaturschalter Kompressor Auslass
+r,,PrioritySwitchingValve,Vorrangumschaltventil WW,,,,0203ffff,,,UIN,0=Heizen;1=Warmwasser,,T.1.02 Vorrangumschaltventil WW
+r,,CylinderTemp,Speichertemperatur,,,,2c03ffff,,,SIN,10,°C,T.1.44 Speichertemperatur
+r,,LockoutContactS20,Sperrkontakt S20,,,,2e03ffff,,,UIN,0=geschlossen;1=offen,,T.1.46 Sperrkontakt S20
+r,,OutdoorTemp,Außentemperatur,,,,4503ffff,,,SIN,10,°C,T.1.69 Außentemperatur
+r,,SystemTemp,Systemtemperatur,,,,4603ffff,,,SIN,10,°C,T.1.70 Systemtemperatur
+r,,DCFStatus,DCF Status,,,,4703ffff,,,UIN,,,T.1.71 DCF Status
+r,,LockoutContactS21,Sperrkontakt S21,,,,4803ffff,,,UIN,0=geschlossen;1=offen,,T.1.72 Sperrkontakt S21
+r,,MA1Output,MA1 Ausgang,,,,7703ffff,,,UIN,0=aus;1=an,,T.1.119 MA1 Ausgang
+r,,ImmersionHeaterSafetyCutOut,STB Heizstab,,,,7c03ffff,,,UIN,0=geschlossen;1=offen,,T.1.124 STB Heizstab
+r,,MIInput,ME Eingang,,,,7d03ffff,,,SIN,,,T.1.125 ME Eingang
+r,,MO2Output,MA2 Ausgang,,,,7e03ffff,,,UIN,0=aus;1=an,,T.1.126 MA1 Ausgang
+r,,MO3Output,MA3 Ausgang,,,,7f03ffff,,,UIN,0=aus;1=an,,T.1.127 MA1 Ausgang
+r,,FlowTempImmersionHeater,Vorlauftemperatur Heizstab,,,,8203ffff,,,SIN,10,°C,T1.130 Vorlauftemperatur Heizstab
+
+
+
+
+!include,hcmode.inc,,,,,,,,,,,,
+!include,errors.inc,,,,,,,,,,,
\ No newline at end of file
diff --git a/ebusd-2.1.x/de/vaillant/15.700.csv b/ebusd-2.1.x/de/vaillant/15.700.csv
index 70cf87aa..2e71fa1d 100644
--- a/ebusd-2.1.x/de/vaillant/15.700.csv
+++ b/ebusd-2.1.x/de/vaillant/15.700.csv
@@ -9,10 +9,10 @@ r;w,,HwcParallelLoading,Parallele Ladung Warmwasserkreis,,,,0A00,,,onoff,,,Heizb
 r;w,,MaxRoomHumidity,maxRoomHumidity,,,,0E00,,,UIN,,,maximale Raumluftfeuchte
 r;w,,AdaptHeatCurve,Adaptive Heizkurve,,,,1400,,,yesno,,,automatic correction of configured heat curve
 r;w,,MaxCylinderChargeTime,maximale Speicherladezeit,,,,1700,,,minutes2,,,maximum cylinder charging time
-r;w,,HwcLockTime,lockTimeHwc,,,,1800,,,minutes2,,,Sperrzeit WW-Bedarf
-r;w,,PumpAdditionalTime,pumpAdditionalTime,,,,1B00,,,minutes2,,,Ladepumpe Nachlaufzeit
-r;w,,CylinderChargeHyst,hystCylinderCharge,,,,2700,,,calibrationv,,,Hysterese Speicherladung
-r;w,,CylinderChargeOffset,offsetCylinderCharge,,,,2900,,,calibrationv,,,Speicherlad. Offset
+r;w,,HwcLockTime,Sperrzeit WW-Bedarf,,,,1800,,,minutes2,,,Sperrzeit WW-Bedarf
+r;w,,PumpAdditionalTime,Ladepumpe Nachlaufzeit,,,,1B00,,,minutes2,,,Ladepumpe Nachlaufzeit
+r;w,,CylinderChargeHyst,Hysterese Speicherladung,,,,2700,,,calibrationv,,,Hysterese Speicherladung
+r;w,,CylinderChargeOffset,Speicherladung Offset,,,,2900,,,calibrationv,,,Speicherladung Offset
 r;w,,MaintenanceDate,nächste Wartung,,,,2C00,,,date,,,Datum nächste Wartung
 r;w,,Date,Datum,,,,3400,,,date,,,Aktuelles Datum
 r;w,,Time,Zeit,,,,3500,,,HTI,,,Aktuelle Uhrzeit
@@ -21,30 +21,30 @@ r;w,,HydraulicScheme,Systemschema,,,,3600,,,UIN,,,Systemschema
 r,,WaterPressure,Wasserdruck,,,,3900,,,pressv,,,Wasserdruck
 r;w,,SolarYieldTotal,TotalSolarYield,,,,3D00,,,energy4,,,Solarertrag gesamt
 r;w,,YieldTotal,TotalEnvironmentalYield,,,,3E00,,,energy4,,,Umweltertrag gesamt
-r;w,,HwcMaxFlowTempDesired,HwcMaxFlowTempDesired,,,,4600,,,tempv,,,maximum flow temperature setpoint of Hwc
-r,,SystemFlowTemp,Systemvorlauf,,,,4B00,,,tempv,,,Systemvorlauf
+r;w,,HwcMaxFlowTempDesired,max.Vorl.solltemp.WW,,,,4600,,,tempv,,,maximum flow temperature setpoint of Hwc
+r,,SystemFlowTemp,Systemvorlauftemperatur,,,,4B00,,,tempv,,,Systemvorlauf
 r;w,,MultiRelaySetting,Multifunktionsausgang,,,,4D00,,,mamode,,,
-r;w,,PrFuelSumHcThisMonth,ThisMonthsFConsumptionHc,,,,4E00,,,energy4,,,Aktueller Monat Brennstoffverbrauch Heizung
-r;w,,PrEnergySumHcThisMonth,ThisMonthsEConsumptionHc,,,,4F00,,,energy4,,,Aktueller Monat Stromverbrauch Heizung
-r;w,,PrEnergySumHwcThisMonth,ThisMonthsEConsumptionHwc,,,,5000,,,energy4,,,Aktueller Monat Stromverbrauch Warmwasser
-r;w,,PrFuelSumHwcThisMonth,ThisMonthsFConsumptionHwc,,,,5100,,,energy4,,,Aktueller Monat Brennstoffverbrauch Warmwasser
-r;w,,PrFuelSumHcLastMonth,LastMonthsFConsumptionHc,,,,5200,,,energy4,,,Letzter Monat Brennstoffverbrauch Heizung
-r;w,,PrEnergySumHcLastMonth,LastMonthsEConsumptionHc,,,,5300,,,energy4,,,Letzter Monat Stromverbrauch Heizung
-r;w,,PrEnergySumHwcLastMonth,LastMonthsEConsumptionHwc,,,,5400,,,energy4,,,Letzter Monat Stromverbrauch Warmwasser
-r;w,,PrFuelSumHwcLastMonth,LastMonthsFConsumptionHwc,,,,5500,,,energy4,,,Letzter Monat Brennstoffverbrauch Warmwasser
-r;w,,PrFuelSumHc,TotalFConsumptionHc,,,,5600,,,energy4,,,Brennstoffverbrauch Heizung gesamt
-r;w,,PrEnergySumHc,TotalEConsumptionHc,,,,5700,,,energy4,,,Stromverbrauch Heizung gesamt
-r;w,,PrEnergySumHwc,TotalEConsumptionHwc,,,,5800,,,energy4,,,Stromverbrauch Warmwasser gesamt
-r;w,,PrFuelSumHwc,TotalFConsumptionHwc,,,,5900,,,energy4,,,Brennstoffverbrauch Warmwasser gesamt
-r;w,,PrEnergySum,TotalEConsumption,,,,5C00,,,energy4,,,Dieses Jahr Stromverbrauch gesamt
-r;w,,PrFuelSum,TotalFConsumption,,,,5D00,,,energy4,,,Dieses Jahr Brennstoffverbrauch gesamt
+r;w,,PrFuelSumHcThisMonth,Brennstoffverbr.akt.Monat Hzg.,,,,4E00,,,energy4,,,Aktueller Monat Brennstoffverbrauch Heizung
+r;w,,PrEnergySumHcThisMonth,Stromverbr.akt.Monat Hzg.,,,,4F00,,,energy4,,,Aktueller Monat Stromverbrauch Heizung
+r;w,,PrEnergySumHwcThisMonth,Stromverbr.akt.Monat WW,,,,5000,,,energy4,,,Aktueller Monat Stromverbrauch Warmwasser
+r;w,,PrFuelSumHwcThisMonth,Brennstoffverbr.akt.Monat WW,,,,5100,,,energy4,,,Aktueller Monat Brennstoffverbrauch Warmwasser
+r;w,,PrFuelSumHcLastMonth,Brennstoffverbr.Vormonat Hzg.,,,,5200,,,energy4,,,Letzter Monat Brennstoffverbrauch Heizung
+r;w,,PrEnergySumHcLastMonth,Stromverbr.Vormonat Hzg.,,,,5300,,,energy4,,,Letzter Monat Stromverbrauch Heizung
+r;w,,PrEnergySumHwcLastMonth,Stromverbr.Vormonat WW,,,,5400,,,energy4,,,Letzter Monat Stromverbrauch Warmwasser
+r;w,,PrFuelSumHwcLastMonth,Brennstoffverbr.Vormonat WW,,,,5500,,,energy4,,,Letzter Monat Brennstoffverbrauch Warmwasser
+r;w,,PrFuelSumHc,Brennstoffverbr.gesamt Hzg.,,,,5600,,,energy4,,,Brennstoffverbrauch Heizung gesamt
+r;w,,PrEnergySumHc,Stromverbr.gesamt Hzg.,,,,5700,,,energy4,,,Stromverbrauch Heizung gesamt
+r;w,,PrEnergySumHwc,Stromverbr.gesamt WW,,,,5800,,,energy4,,,Stromverbrauch Warmwasser gesamt
+r;w,,PrFuelSumHwc,Brennstoffverbr.gesamt WW,,,,5900,,,energy4,,,Brennstoffverbrauch Warmwasser gesamt
+r;w,,PrEnergySum,Stromverbr.gesamt Jahr,,,,5C00,,,energy4,,,Dieses Jahr Stromverbrauch gesamt
+r;w,,PrFuelSum,Brennstoffverbr.gesamt Jahr,,,,5D00,,,energy4,,,Dieses Jahr Brennstoffverbrauch gesamt
 #r;w,,Unknown67,(VR70 konfig 1),,,,6700,,,tempv,,,unknown value
 #r;w,,Unknown68,(VR70 konfig 1),,,,6800,,,tempv,,,unknown value
 r;w,,OpModeEffect,OpModeEffect,,,,6900,,,zonesel,,,selection which heating circuit is affected by changing parameters in the basic display
 r;w,,Installer1,Installationsfirma Teil 1,,,,6C00,,,shortname,,,installer's name
 r;w,,Installer2,Installationsfirma Teil 2,,,,6D00,,,shortname,,,installer's name
-r;w,,PhoneNumber1,Telefonnummer,,,,6F00,,,shortphone,,,installer's telephone number
-r;w,,PhoneNumber2,Telefonnummer,,,,7000,,,shortphone,,,installer's telephone number
+r;w,,PhoneNumber1,Telefonnummer 1,,,,6F00,,,shortphone,,,installer's telephone number
+r;w,,PhoneNumber2,Telefonnummer 2,,,,7000,,,shortphone,,,installer's telephone number
 r;w,,HolidayStartPeriod,HolidayStartPeriod,,,,7100,,,hfrom,,,start date of holidays
 r;w,,HolidayEndPeriod,HolidayEndPeriod,,,,7200,,,hto,,,end date of holidays
 r,,DisplayedOutsideTemp,Außentemperatur,,,,7300,,,tempv,,,Außentemperatur
@@ -64,9 +64,9 @@ r,,HcStorageTempBottom,"Temp.fühler Hz, unten",,,,A000,,,tempv,,,"Temp.fühler
 # ##### Warmwasserkreis #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000100,,,IGN:4,,,
 *w,,,,,,B524,02010100,,,,,,
-r;w,,HwcOpMode,HwcOpMode,,,,0300,,,opmode,,,operation mode of Hwc
-r;w,,HwcTempDesired,gewünschte Temperatur Warmwasserkreis,,,,0400,,,tempv,,,setpoint of domestic hot water circuit
-r,,HwcStorageTemp,HwcStorageTemp,,,,0500,,,tempv,,,Speicheristtemperatur
+r;w,,HwcOpMode,Betriebsart Warmwasserkreis,,,,0300,,,opmode,,,operation mode of the domestic hot water circuit
+r;w,,HwcTempDesired,Speichersolltemperatur,,,,0400,,,tempv,,,setpoint of domestic hot water circuit
+r,,HwcStorageTemp,Speicheristtemperatur,,,,0500,,,tempv,,,Speicheristtemperatur
 r,,HwcFlowTemp,HwcFlowTemp,,,,0800,,,tempv,,,desired flow temp for Hwc
 r;w,,HwcHolidayStartPeriod,HwcHolidayStartPeriod,,,,0900,,,hfrom,,,start date of holidays
 r;w,,HwcHolidayEndPeriod,HwcHolidayEndPeriod,,,,0A00,,,hto,,,end date of holidays
@@ -76,69 +76,69 @@ r;w,,HwcSFMode,HwcSFMode,,,,0D00,,,sfmode,,,
 # ##### Heizkreis 1 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000200,,,IGN:4,,,
 *w,,,,,,B524,02010200,,,,,,
-r,,Hc1CircuitType,CircuitType Heizkreis 1,,,,0200,,,mctype;IGN:1,,,
+r,,Hc1CircuitType,Kreisart Heizkreis 1,,,,0200,,,mctype;IGN:1,,,
 #r;w,,Hc1Unknown04,(konstant 30) Temperatur Heizkreis 1,,,,0400,,,tempv,,,unknown value for Hc1
-r,,Hc1ActualFlowTempDesired,ActualFlowTempDesired Heizkreis 1,,,,0700,,,tempv,,,current flow temperature setpoint of Hc1
-r,,Hc1FlowTemp,FlowTemp Heizkreis 1,,,,0800,,,tempv,,,current flow temperature of Hc1
+r,,Hc1ActualFlowTempDesired,Aktuelle Vorlauftemperatur Soll Heizkreis 1,,,,0700,,,tempv,,,current flow temperature setpoint of Hc1
+r,,Hc1FlowTemp,Vorlauftemp. IST Heizkreis 1,,,,0800,,,tempv,,,current flow temperature of Hc1
 #r;w,,Hc1Unknown09,(konstant 60) Temperatur,,,,0900,,,tempv,,,unknown value for Hc1
 r;w,,Hc1ExcessTemp,ExcessTemp Heizkreis 1,,,,0B00,,,calibrationv,,,excess temperature of Hc1 (flow temperature's setpoint is increased by this value to keep the mixing valve in its control range)
 #r;w,,Hc1Unknown0c,(konstant 65) Temperatur Heizkreis 1,,,,0C00,,,tempv,,,unknown value for Hc1
 #r;w,,Hc1Unknown0d,(konstant 65) Temperatur Heizkreis 1,,,,0D00,,,tempv,,,unknown value for Hc1
-r;w,,Hc1AutoOffMode,AutoOffMode Heizkreis 1,,,,0E00,,,offmode,,,operation of Hc1 during the lowering time; no influence if room temperature modulation is set to thermostat
+r;w,,Hc1AutoOffMode,Automatisch Aus Modus Heizkreis 1,,,,0E00,,,offmode,,,operation of Hc1 during the lowering time; no influence if room temperature modulation is set to thermostat
 r;w,,Hc1HeatCurve,Heizkurve Heizkreis 1,,,,0F00,,,EXP,,,heating curve of Hc1
-r;w,,Hc1MaxFlowTempDesired,MaxFlowTempDesired Heizkreis 1,,,,1000,,,tempv,,,maximum flow temperature setpoint (end emphasis) of Hc1
+r;w,,Hc1MaxFlowTempDesired,Maximaltemperatur Heizkreis 1,,,,1000,,,tempv,,,maximum flow temperature setpoint (end emphasis) of Hc1
 #r;w,,Hc1Unknown11,(konstant 20) Temperatur Heizkreis 1,,,,1100,,,tempv,,,unknown value for Hc1
-r;w,,Hc1MinFlowTempDesired,MinFlowTempDesired Heizkreis 1,,,,1200,,,tempv,,,minimum flow temperature setpoint (end emphasis) of Hc1
+r;w,,Hc1MinFlowTempDesired,Minimaltemperatur Heizkreis 1,,,,1200,,,tempv,,,minimum flow temperature setpoint (end emphasis) of Hc1
 r;w,,Hc1SummerTempLimit,AT-Abschaltgrenze Heizkreis 1,,,,1400,,,tempv,,,if outside temperature > summer limit => heating is OFF;applies to comfort and night setback setpoint
-r;w,,Hc1RoomTempSwitchOn,RoomTempSwitchOn Heizkreis 1,,,,1500,,,rcmode,,,room temperature modulation of Hc1
+r;w,,Hc1RoomTempSwitchOn,Raumaufschaltung Heizkreis 1,,,,1500,,,rcmode,,,room temperature modulation of Hc1
 r,,Hc1MixerMovement,MixerMovement Heizkreis 1,,,,1A00,,,EXP,,,"status of mixer (<0 closing, >0 opening)"
 r,,Hc1HeatCurveAdaption,Anpassung Heizkurve Heizkreis 1,,,,1C00,,,EXP,,,adaption applied to heating curve of Hc1
 r;w,,Hc1Status,Status Heizkreis 1,,,,1B00,,,UCH,,,status of zone 1
-r;w,,Hc1PumpStatus,PumpStatus Heizkreis 1,,,,1E00,,,UIN,,,pump status of zone 1
+r;w,,Hc1PumpStatus,Pumpenstatus Heizkreis 1,,,,1E00,,,UIN,,,pump status of zone 1
 # ##### Heizkreis 2 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000201,,,IGN:4,,,
 *w,,,,,,B524,02010201,,,,,,
-r,,Hc2CircuitType,CircuitType Heizkreis 2,,,,0200,,,mctype;IGN:1,,,
+r,,Hc2CircuitType,Kreisart Heizkreis 2,,,,0200,,,mctype;IGN:1,,,
 #r;w,,Hc2Unknown04,(konstant 30) Temperatur Heizkreis 2,,,,0400,,,tempv,,,unknown value for Hc2
-r,,Hc2ActualFlowTempDesired,ActualFlowTempDesired Heizkreis 2,,,,0700,,,tempv,,,current flow temperature setpoint of Hc2
-r,,Hc2FlowTemp,FlowTemp Heizkreis 2,,,,0800,,,tempv,,,current flow temperature of Hc2
+r,,Hc2ActualFlowTempDesired,Aktuelle Vorlauftemperatur Soll Heizkreis 2,,,,0700,,,tempv,,,current flow temperature setpoint of Hc2
+r,,Hc2FlowTemp,Vorlauftemp. IST Heizkreis 2,,,,0800,,,tempv,,,current flow temperature of Hc2
 #r;w,,Hc2Unknown09,(konstant 60) Temperatur,,,,0900,,,tempv,,,unknown value for Hc2
 r;w,,Hc2ExcessTemp,ExcessTemp Heizkreis 2,,,,0B00,,,calibrationv,,,excess temperature of Hc2 (flow temperature's setpoint is increased by this value to keep the mixing valve in its control range)
 #r;w,,Hc2Unknown0c,(konstant 65) Temperatur Heizkreis 2,,,,0C00,,,tempv,,,unknown value for Hc2
 #r;w,,Hc2Unknown0d,(konstant 65) Temperatur Heizkreis 2,,,,0D00,,,tempv,,,unknown value for Hc2
-r;w,,Hc2AutoOffMode,AutoOffMode Heizkreis 2,,,,0E00,,,offmode,,,operation of Hc2 during the lowering time; no influence if room temperature modulation is set to thermostat
+r;w,,Hc2AutoOffMode,Automatisch Aus Modus Heizkreis 2,,,,0E00,,,offmode,,,operation of Hc2 during the lowering time; no influence if room temperature modulation is set to thermostat
 r;w,,Hc2HeatCurve,Heizkurve Heizkreis 2,,,,0F00,,,EXP,,,heating curve of Hc2
-r;w,,Hc2MaxFlowTempDesired,MaxFlowTempDesired Heizkreis 2,,,,1000,,,tempv,,,maximum flow temperature setpoint (end emphasis) of Hc2
+r;w,,Hc2MaxFlowTempDesired,Maximaltemperatur Heizkreis 2,,,,1000,,,tempv,,,maximum flow temperature setpoint (end emphasis) of Hc2
 #r;w,,Hc2Unknown11,(konstant 20) Temperatur Heizkreis 2,,,,1100,,,tempv,,,unknown value for Hc2
-r;w,,Hc2MinFlowTempDesired,MinFlowTempDesired Heizkreis 2,,,,1200,,,tempv,,,minimum flow temperature setpoint (end emphasis) of Hc2
+r;w,,Hc2MinFlowTempDesired,Minimaltemperatur Heizkreis 2,,,,1200,,,tempv,,,minimum flow temperature setpoint (end emphasis) of Hc2
 r;w,,Hc2SummerTempLimit,AT-Abschaltgrenze Heizkreis 2,,,,1400,,,tempv,,,if outside temperature > summer limit => heating is OFF;applies to comfort and night setback setpoint
-r;w,,Hc2RoomTempSwitchOn,RoomTempSwitchOn Heizkreis 2,,,,1500,,,rcmode,,,room temperature modulation of Hc2
+r;w,,Hc2RoomTempSwitchOn,Raumaufschaltung Heizkreis 2,,,,1500,,,rcmode,,,room temperature modulation of Hc2
 r,,Hc2MixerMovement,MixerMovement Heizkreis 2,,,,1A00,,,EXP,,,"status of mixer (<0 closing, >0 opening)"
 r,,Hc2HeatCurveAdaption,Anpassung Heizkurve Heizkreis 2,,,,1C00,,,EXP,,,adaption applied to heating curve of Hc2
 r;w,,Hc2Status,Status Heizkreis 2,,,,1B00,,,UCH,,,status of zone 2
-r;w,,Hc2PumpStatus,PumpStatus Heizkreis 2,,,,1E00,,,UIN,,,pump status of zone 2
+r;w,,Hc2PumpStatus,Pumpenstatus Heizkreis 2,,,,1E00,,,UIN,,,pump status of zone 2
 # ##### Heizkreis 3 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000202,,,IGN:4,,,
 *w,,,,,,B524,02010202,,,,,,
-r,,Hc3CircuitType,CircuitType Heizkreis 3,,,,0200,,,mctype;IGN:1,,,
+r,,Hc3CircuitType,Kreisart Heizkreis 3,,,,0200,,,mctype;IGN:1,,,
 #r;w,,Hc3Unknown04,(konstant 30) Temperatur Heizkreis 3,,,,0400,,,tempv,,,unknown value for Hc3
-r,,Hc3ActualFlowTempDesired,ActualFlowTempDesired Heizkreis 3,,,,0700,,,tempv,,,current flow temperature setpoint of Hc3
-r,,Hc3FlowTemp,FlowTemp Heizkreis 3,,,,0800,,,tempv,,,current flow temperature of Hc3
+r,,Hc3ActualFlowTempDesired,Aktuelle Vorlauftemperatur Soll Heizkreis 3,,,,0700,,,tempv,,,current flow temperature setpoint of Hc3
+r,,Hc3FlowTemp,Vorlauftemp. IST Heizkreis 3,,,,0800,,,tempv,,,current flow temperature of Hc3
 #r;w,,Hc3Unknown09,(konstant 60) Temperatur,,,,0900,,,tempv,,,unknown value for Hc3
 r;w,,Hc3ExcessTemp,ExcessTemp Heizkreis 3,,,,0B00,,,calibrationv,,,excess temperature of Hc3 (flow temperature's setpoint is increased by this value to keep the mixing valve in its control range)
 #r;w,,Hc3Unknown0c,(konstant 65) Temperatur Heizkreis 3,,,,0C00,,,tempv,,,unknown value for Hc3
 #r;w,,Hc3Unknown0d,(konstant 65) Temperatur Heizkreis 3,,,,0D00,,,tempv,,,unknown value for Hc3
-r;w,,Hc3AutoOffMode,AutoOffMode Heizkreis 3,,,,0E00,,,offmode,,,operation of Hc3 during the lowering time; no influence if room temperature modulation is set to thermostat
+r;w,,Hc3AutoOffMode,Automatisch Aus Modus Heizkreis 3,,,,0E00,,,offmode,,,operation of Hc3 during the lowering time; no influence if room temperature modulation is set to thermostat
 r;w,,Hc3HeatCurve,Heizkurve Heizkreis 3,,,,0F00,,,EXP,,,heating curve of Hc3
-r;w,,Hc3MaxFlowTempDesired,MaxFlowTempDesired Heizkreis 3,,,,1000,,,tempv,,,maximum flow temperature setpoint (end emphasis) of Hc3
+r;w,,Hc3MaxFlowTempDesired,Maximaltemperatur Heizkreis 3,,,,1000,,,tempv,,,maximum flow temperature setpoint (end emphasis) of Hc3
 #r;w,,Hc3Unknown11,(konstant 20) Temperatur Heizkreis 3,,,,1100,,,tempv,,,unknown value for Hc3
-r;w,,Hc3MinFlowTempDesired,MinFlowTempDesired Heizkreis 3,,,,1200,,,tempv,,,minimum flow temperature setpoint (end emphasis) of Hc3
+r;w,,Hc3MinFlowTempDesired,Minimaltemperatur Heizkreis 3,,,,1200,,,tempv,,,minimum flow temperature setpoint (end emphasis) of Hc3
 r;w,,Hc3SummerTempLimit,AT-Abschaltgrenze Heizkreis 3,,,,1400,,,tempv,,,if outside temperature > summer limit => heating is OFF;applies to comfort and night setback setpoint
-r;w,,Hc3RoomTempSwitchOn,RoomTempSwitchOn Heizkreis 3,,,,1500,,,rcmode,,,room temperature modulation of Hc3
+r;w,,Hc3RoomTempSwitchOn,Raumaufschaltung Heizkreis 3,,,,1500,,,rcmode,,,room temperature modulation of Hc3
 r,,Hc3MixerMovement,MixerMovement Heizkreis 3,,,,1A00,,,EXP,,,"status of mixer (<0 closing, >0 opening)"
 r,,Hc3HeatCurveAdaption,Anpassung Heizkurve Heizkreis 3,,,,1C00,,,EXP,,,adaption applied to heating curve of Hc3
 r;w,,Hc3Status,Status Heizkreis 3,,,,1B00,,,UCH,,,status of zone 2
-r;w,,Hc3PumpStatus,PumpStatus Heizkreis 3,,,,1E00,,,UIN,,,pump status of zone 3
+r;w,,Hc3PumpStatus,Pumpenstatus Heizkreis 3,,,,1E00,,,UIN,,,pump status of zone 3
 # ##### Zone 1 #####,,,,,,,,,,,,,
 *r,,,,,,B524,02000300,,,IGN:4,,,
 *w,,,,,,B524,02010300,,,,,,
@@ -239,13 +239,13 @@ r;w,,tariffTimer.Sunday,Zeitfenster Hochtarif Sonntag,,,,06,,,slot1-3,,,
 # Schaltzeiten Warmwasser,,,,,,,,,,,,,
 *r,,,,,,B524,03010001,,,IGN:1,,,whether timeslot is valid
 *w,,,,,,B524,04010001,,,,,,
-r;w,,hwcTimer.Monday,Zeitfenster Montag,,,,00,,,slot1-3,,,
-r;w,,hwcTimer.Tuesday,Zeitfenster Dienstag,,,,01,,,slot1-3,,,
-r;w,,hwcTimer.Wednesday,Zeitfenster Mittwoch,,,,02,,,slot1-3,,,
-r;w,,hwcTimer.Thursday,Zeitfenster Donnerstag,,,,03,,,slot1-3,,,
-r;w,,hwcTimer.Friday,Zeitfenster Freitag,,,,04,,,slot1-3,,,
-r;w,,hwcTimer.Saturday,Zeitfenster Samstag,,,,05,,,slot1-3,,,
-r;w,,hwcTimer.Sunday,Zeitfenster Sonntag,,,,06,,,slot1-3,,,
+r;w,,hwcTimer.Monday,Zeitfenster WW Montag,,,,00,,,slot1-3,,,
+r;w,,hwcTimer.Tuesday,Zeitfenster WW Dienstag,,,,01,,,slot1-3,,,
+r;w,,hwcTimer.Wednesday,Zeitfenster WW Mittwoch,,,,02,,,slot1-3,,,
+r;w,,hwcTimer.Thursday,Zeitfenster WW Donnerstag,,,,03,,,slot1-3,,,
+r;w,,hwcTimer.Friday,Zeitfenster WW Freitag,,,,04,,,slot1-3,,,
+r;w,,hwcTimer.Saturday,Zeitfenster WW Samstag,,,,05,,,slot1-3,,,
+r;w,,hwcTimer.Sunday,Zeitfenster WW Sonntag,,,,06,,,slot1-3,,,
 # Zeitprogramm Zirkulationspumpe,,,,,,,,,,,,,
 *r,,,,,,B524,03010002,,,IGN:1,,,whether timeslot is valid
 *w,,,,,,B524,04010002,,,,,,
diff --git a/ebusd-2.1.x/de/vaillant/15.720.csv b/ebusd-2.1.x/de/vaillant/15.720.csv
new file mode 120000
index 00000000..9c67bc32
--- /dev/null
+++ b/ebusd-2.1.x/de/vaillant/15.720.csv
@@ -0,0 +1 @@
+15.700.csv
\ No newline at end of file
diff --git a/ebusd-2.1.x/de/vaillant/15.basv.csv b/ebusd-2.1.x/de/vaillant/15.basv.csv
new file mode 120000
index 00000000..9c67bc32
--- /dev/null
+++ b/ebusd-2.1.x/de/vaillant/15.basv.csv
@@ -0,0 +1 @@
+15.700.csv
\ No newline at end of file
diff --git a/ebusd-2.1.x/de/vaillant/15.uih.csv b/ebusd-2.1.x/de/vaillant/15.uih.csv
index 65f86cf9..8330f701 100644
--- a/ebusd-2.1.x/de/vaillant/15.uih.csv
+++ b/ebusd-2.1.x/de/vaillant/15.uih.csv
@@ -49,6 +49,7 @@ r;wi,,EhpHeatBufferAvailable,EhpHeatBufferAvailable,,,,"5C00",,,onoff,,,Puffersp
 [SW>=362]r,,reserve1,reserve 1,,,,"9D00",,,UCH,,,for future use
 # ##### HK Namen und Tel. Nummer #####,,,,,,,,,,,,,
 r;w,,HcName2,Name HK2,,,,"4108",,,hcname,,,Name für HK2
+r;w,,HcName3,Name HK3,,,,"4110",,,hcname,,,Name für HK3
 r;w,,HcName4,Name HK4,,,,"4118",,,hcname,,,Name für HK4
 r;w,,HcName5,Name HK5,,,,"4120",,,hcname,,,Name für HK5
 r;w,,HcName6,Name HK6,,,,"4128",,,hcname,,,Name für HK6
diff --git a/ebusd-2.1.x/de/vaillant/_templates.csv b/ebusd-2.1.x/de/vaillant/_templates.csv
index e51a8a01..417bb889 100644
--- a/ebusd-2.1.x/de/vaillant/_templates.csv
+++ b/ebusd-2.1.x/de/vaillant/_templates.csv
@@ -29,20 +29,20 @@ calibration1,D1C,,K,
 calibrations,SCH,2,K,
 calibrationv,EXP,,K,
 integral,SIN,,°min,
-hcmode,UCH,0=auto;1=off;2=heat;2=water,,Boiler Modus
+hcmode,UCH,0=auto;1=off;2=heat;3=water,,Boiler Modus
 hcmode2,UCH,0=off;3=heat;4=water,,Boiler Modus
 mcmode,UCH,0=disabled;1=on;2=off;3=auto;4=eco;5=low,,Mischer Modus
-mctype,UCH,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool,,Mischer Typ
-mctype7,BI0:7,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool,,Mischer Typ
+mctype,UCH,0=inaktiv;1=Heizen;2=Festwert;3=WW;4=Rückl.anh.;5=Pool,,Mischer Typ
+mctype7,BI0:7,0=inaktiv;1=Heizen;2=Festwert;3=WW;4=Rückl.anh.;5=Pool,,Mischer Typ
 hwcmode,UCH,0=disabled;1=on;2=off;3=auto,,Warmwasser Modus
 hwcmode2,UCH,0=off;1=on;2=auto;3=manual,,Warmwasser Modus
-mixer,UCH,0=off;1=open;2=close,,Mixer Status
+mixer,UCH,0=aus;1=offen;2=geschlossen,,Mixer Status
 daynight,UCH,0=night;1=day;7=floorpaving,,Tag-/Nachtmodus
 status,UCH,,,Status
-onoff,UCH,0=off;1=on,,
-yesno,UCH,0=no;1=yes,,
-errorok,UCH,0=ok;1=error,,
-sensor,UCH,0=ok;85=circuit;170=cutoff,,Fühlerstatus
+onoff,UCH,0=aus;1=ein,,
+yesno,UCH,0=nein;1=ja,,
+errorok,UCH,0=ok;1=Fehler,,
+sensor,UCH,0=ok;85=geschlossen;170=getrennt,,Fühlerstatus
 tempsensor,temp;sensor,,,
 tempmirror,UIN,,,
 tempmirrorsensor,temp;tempmirror;sensor,,,
@@ -61,10 +61,10 @@ errors,error;error;error;error;error,,,
 errorhistory,status;time2;date;error,,,
 from,TTM,,,von
 to,TTM,,,bis
-slot1,from;to,,,Slot 1 von/bis
-slot2,from;to,,,Slot 2 von/bis
-slot3,from;to,,,Slot 3 von/bis
-slot1-3,slot1;slot2;slot3,,,Slots 1-3
+slot1,from;to,,,Zeitfenster 1 von/bis
+slot2,from;to,,,Zeitfenster 2 von/bis
+slot3,from;to,,,Zeitfenster 3 von/bis
+slot1-3,slot1;slot2;slot3,,,Zeitfenster 1-3
 timer,slot1-3;daysel,,,
 backtype,UCH,0=not present;1=externalheat;2=externalwater;3=externalheatandwater;4=internalheatandwater,,
 backmode,UCH,0=no backup;1=withbackup;2=onlybackup,,
@@ -74,7 +74,7 @@ energyr,UIR,,kWh,
 energy4,ULG,,kWh,
 cntstarts,ULG,,,Anzahl Starts
 cntstarts2,UIN,,,Anzahl Starts
-pumppow,UCH,0=0;1=1;2=2;3=3;4=4;5=5;6=6;7=off,,Pumpenleistung
+pumppow,UCH,0=0;1=1;2=2;3=3;4=4;5=5;6=6;7=aus,,Pumpenleistung
 pumpstate,UCH,0=off;1=on;2=overrun,,Pumpenstatus
 dcfstate,UCH,0=nosignal;1=ok;2=sync;3=valid,,DCF Empfängerstatus
 phaseok,UCH,0=error;7=ok,,Phasenstatus
@@ -95,5 +95,5 @@ shortname,STR:6,,,Name
 phone,STR:9,,,Telefonnummer
 shortphone,STR:6,,,Telefonnummer
 mamode,UIN,0=circulation;1=dryer;2=zone;3=legiopump,,
-offmode,UIN,0=eco;1=night,,
-rcmode,UIN,0=off;1=modulating;2=thermostat,,
+offmode,UIN,0=Eco;1=Nacht,,
+rcmode,UIN,0=keine;1=Aufschaltung;2=Thermostat,,
diff --git a/ebusd-2.1.x/de/vaillant/bai.0010005400.inc b/ebusd-2.1.x/de/vaillant/bai.0010005400.inc
index ab3475eb..fad8b2eb 100644
--- a/ebusd-2.1.x/de/vaillant/bai.0010005400.inc
+++ b/ebusd-2.1.x/de/vaillant/bai.0010005400.inc
@@ -103,7 +103,7 @@ r,,PrVortexFlowSensorValue,PrVortexFlowSensorValue_DK,,,,"F400",,,SIN,,ADC,Wartu
 r,,PrEnergyCountHc1,PrEnergyCountCH1_DK,,,,"F500",,,ULG,,,Wartungsdaten
 # ##### expert level\Main #####,,,,,,,,,,,,,
 r,,externalFlowTempDesired,ext. Vorlaufsollwert,,,,"2500",,,temp,,,Vorlaufsollwert von einem externen Regler an Klemme 7-8-9
-r,,externalHwcSwitch,Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt
+r,,externalHwcSwitch,ext. Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt
 r,,Flame,Flammensignal,,,,"0500",,,UCH,240=off;15=on,,Flammensignal
 r,,IFCFault,SD_IFC_Fault_DK,,,,"0700",,,UCH,240=off;15=on,,IFC error
 r,,ChangesDSN,Anzhl der DSN Änderungen,,,,"0C00",,,UCH,,,Anzahl der DSN (Gerätekennung) Änderungen
diff --git a/ebusd-2.1.x/de/vaillant/bai.0010015600.inc b/ebusd-2.1.x/de/vaillant/bai.0010015600.inc
index 58343b54..90a8b4a5 100644
--- a/ebusd-2.1.x/de/vaillant/bai.0010015600.inc
+++ b/ebusd-2.1.x/de/vaillant/bai.0010015600.inc
@@ -1,7 +1,7 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,,,
 #,BAI00,ecoCompact (euro),0010015600 296,,,,,,,,,,,,,
 *r,,,,,,"B509","0D",,,,,,,,,
-*w,#NOT_YET_CONFIRMED,,,,,"B509","0E",,,,,,,,,
+*w,,,,,,"B509","0E",,,,,,,,,
 *wi,#install_NOT_YET_CONFIRMED,,,,,"B509","0E",,,,,,,,,
 *ws,#service_NOT_YET_CONFIRMED,,,,,"B509","0E",,,,,,,,,
 *[SW>=413],scan,,,SW,,>=413,,,,,,,,,,
@@ -36,7 +36,7 @@ r,,RemainingBoilerblocktime,d.67 Verbleibende Brennersperrzeit,,,,"3800",,,minut
 #r,,EBusHeatcontrol,d.90 Digitaler Regler,,,,"0004",,,yesno,,,Gibt an ob ein digitaler Regler erkannt wurde,,,
 r,,dcfState,d.91 DCF Status,,,,"6900",,,dcfstate,,,DCF Status,,,
 # ##### Expertenebene #####,,,,,,,,,,,,,,,,
-r,,externalHwcSwitch,Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt,,,
+r,,externalHwcSwitch,ext. Wasserschalter,,,,"0000",,,onoff,,,Speicheranforderung eines externen Speichers über den Speicherkontakt,,,
 r,,WaterPressure,Wasserdruck,,,,"0200",,,presssensor,,,Wasserdruck,,,
 r,,Flame,Flammensignal,,,,"0500",,,UCH,240=off;15=on,,Flammensignal,,,
 r,,ChangesDSN,Anzahl der DSN Änderungen,,,,"0C00",,,UCH,,,Anzahl der DSN (Gerätekennung) Änderungen,,,
@@ -57,11 +57,11 @@ r,,HwcImpellorSwitch,Brauchwasserzapfung,,,,"5700",,,yesno,,,WW Zapfung,,,
 r,,WarmstartDemand,Warmstartanforderung,,,,"3A04",,,yesno,,,Warmstartaktivierung,,,
 r,,BoilerType,BoilerType,,,,"5E00",,,UCH,,,Boiler typ of the bmu,,,
 r,,ParamToken,ParamToken,,,,"6000",,,UCH,,,token for parameter managment,,,
-r,,ReturnTempExternal,Rücklauftemperatur,,,,"6B00",,,tempsensor,,,Externer Rücklauftemperatursensor,,,
+r,,ReturnTempExternal,ext. Rücklauftemperatur,,,,"6B00",,,tempsensor,,,Externer Rücklauftemperatursensor,,,
 r,,FloorHeatingContact,Anlegethermostat,,,,"7000",,,onoff,,,Eingang Anlegethermostat,,,
 r,,Templimiter,Temperaturbegrenzer,,,,"7700",,,UCH,240=off;15=on,,Rückmeldung des Temperaturbegrenzer Signals,,,
 r,,EbusVoltage,eBUS Spannung,,,,"7F00",,,onoff,,,Rückmeldung der eBUS Spannung,,,
-r,,FluegasvalveOpen,Abgasklappe offen,,,,"8900",,,onoff,,,Rückmeldung Flüssiggasventil,,,
+r,,FluegasvalveOpen,Abgasklappe offen,,,,"8900",,,yesno,,,Rückmeldung Flüssiggasventil,,,
 r,,Testbyte,Testbyte,,,,"9900",,,UCH,,,Testbyte (relevant for the Tester),,,
 r,,DSN,DSN,,,,"9A00",,,UIN,,,DSN: Device Specific number,,,
 r,,TargetFanSpeedOutput,Lüfter Solldrehzahl,,,,"9F00",,,UIN,,1/min,Lüfterdrehzahl,,,
@@ -98,8 +98,8 @@ r,,DeactivationsTemplimiter,d.60 STB Abschaltungen,,,,"2000",,,UCH,,,Anzahl der
 r,,DeactivationsIFC,d.61 Anzahl Zündfehler,,,,"1F00",,,UCH,,,Anzahl der Zündfehler (nicht erfolgreiche Züdung im letzten Versuch oder fehlerhaftes Flammensignal),,,
 r,,averageIgnitiontime,d.64 Mittlere Zündzeit,,,,"2D00",,,UCH,10,s,Mittlere Zündzeit,,,
 r,,maxIgnitiontime,d.65 Max. Zündzeit,,,,"2C00",,,UCH,10,s,Maximale Zündzeit,,,
-r,,CounterStartattempts1,d.68 Zündfehler 1. Versuch,,,,"6E00",,,temp0,,,Anzahl der erfolglosen Zündversuche (im 1. Versuch),,,
-r,,CounterStartattempts2,d.69 Zündfehler 2. Versuch,,,,"6F00",,,temp0,,,Anzahl der erfolglosen Zündversuche (im 2. Versuch),,,
+r,,CounterStartattempts1,d.68 Zündfehler 1. Versuch,,,,"6E00",,,UCH,,,Anzahl der erfolglosen Zündversuche (im 1. Versuch),,,
+r,,CounterStartattempts2,d.69 Zündfehler 2. Versuch,,,,"6F00",,,UCH,,,Anzahl der erfolglosen Zündversuche (im 2. Versuch),,,
 r;wi,,FlowsetHcMax,d.71 Max. Vorlauftemp. Heizbetrieb,,,,"0E04",,,temp,,,Einstellung des maximalen Vorlaufsollwert im Heizbetrieb (bei Linksanschlag des Poti),,,
 [SW>=413]r;wi,,APCLegioProtection,d.74 Legionellenschutz int.Speicher,,,,"9704",,,UCH,,,Legionellenschutz für internen Speicher,,,
 r;wi,,StorageLoadTimeMax,d.75 Max. Speicherladezeit,,,,"6600",,,minutes0,,,Max. Speicherladezeit für Speicher ohne eigene Regelung,,,
diff --git a/ebusd-2.1.x/de/vaillant/broadcast.csv b/ebusd-2.1.x/de/vaillant/broadcast.csv
index bb3df26c..af2b274b 100644
--- a/ebusd-2.1.x/de/vaillant/broadcast.csv
+++ b/ebusd-2.1.x/de/vaillant/broadcast.csv
@@ -1,6 +1,7 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m;s),type / templates,divider / values,unit,comment,field2,part (m;s),type / templates,divider / values,unit,comment,field3,part (m;s),type / templates,divider / values,unit,comment
 *b,broadcast,,,,"FE","B516",,,,,,,,,,,,,,,,,,,
-b,,vdatetime,Datum/Uhrzeit,,,,"00",time,,BTI,,,,date,,BDA,,,,,,,,,
+*wi,broadcast,,,,"FE","B516",,,,,,,,,,,,,,,,,,,
+b;wi,,vdatetime,Datum/Uhrzeit,,,,"00",time,,BTI,,,,date,,BDA,,,,,,,,,
 b,,outsidetemp,Außentemperatur,,,,"01",,,temp2,,,,,,,,,,,,,,,
 *b,broadcast,,,,"FE","B505",,,,,,,,,,,,,,,,,,,
 b,,hwcStatus,Status Warmwasser,,,,"27",,,onoff,,,,VF1,,temp0,,,,,,onoff,,,
diff --git a/ebusd-2.1.x/de/vaillant/hcmode.inc b/ebusd-2.1.x/de/vaillant/hcmode.inc
index 8983f9fe..a762eaca 100644
--- a/ebusd-2.1.x/de/vaillant/hcmode.inc
+++ b/ebusd-2.1.x/de/vaillant/hcmode.inc
@@ -7,9 +7,9 @@ r,,Status16,Aussentemperatur,,,,16,,,temp,,,
 # HC Betriebsart2,,,,,,,,,,,,,
 *r,,,,,,"B511",,,,,,,
 *uw,,,,,,"B510",,,,,,,
-uw,,SetMode,Betriebsart,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempdesired,,temp1,,,,hwcflowtempdesired,,temp0,,,,,,IGN:1,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,,,IGN:1,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2,,,,
+uw,,SetMode,Betriebsart,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempdesired,,temp1,,,,hwcflowtempdesired,,temp1,,,,,,IGN:1,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,,,IGN:1,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2,,,,
 r,,Status01,Vorlauftemperatur/Rücklauftemperatur/Aussentemperatur/WW Temperatur/Speichertemperatur/Pumpenstatus,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
-r,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTEMP/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
+r,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTemp/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
 r,,Status,Status,,,,03,,,temp;press;press;hcmode2;HEX,,,
 
 *uw,,,,,,"B512",,,,,,,
diff --git a/ebusd-2.1.x/en/vaillant/06.vms.csv b/ebusd-2.1.x/en/vaillant/06.vms.csv
new file mode 100644
index 00000000..d22238ee
--- /dev/null
+++ b/ebusd-2.1.x/en/vaillant/06.vms.csv
@@ -0,0 +1,41 @@
+# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
+#,VMS00,VMS20 S,0020071488 243,,,,,,,,,,
+*r,,,,,,"B509","0D",,,,,,
+*w,,,,,,"B509","0E",,,,,,
+*wi,#install,,,,,"B509","0E",,,,,,
+# ##### general #####,,,,,,,,,,,,,
+r,,Ntc1Sensor,Ntc1Sensor,,,,"0500",,,tempsensor,,,Temperature in solar flow (from solar collector)
+r,,Ntc2Sensor,Ntc2Sensor,,,,"0600",,,tempsensor,,,Temperature in solar back flow (to solar collector)
+r;wi,,SolPumpRelay,Relais Solarpumpe,,,,"0F00",,,onoff,,,Solar pump relay: 0: OFF; 1: ON
+r;wi,,SolPumpPower,SolarPumpPower,,,,"1000",,,power,,,Performance of solar pump: (7 - 100 %)
+r;wi,,BufferPumpPower,BufferPumpPower,,,,"1100",,,power,,,Performance of buffer pump: (15 - 100%)
+r,,MonitorMatlabLast5minSolAverage,MonitorMatlab_Last5minSolarAverage,,,,"1700",,,SIN,,,
+r,,CurrentVPMLoadingMode,CurrentVPM_LoadingMode,,,,"1900",,,UCH,,,"1. DHW-Support (stand alone), 2. CH-Support (stand alone), 3. +10K (stand alone), 4. SwimmingPool, 5.DHW-Support (with external control), 6. CH-Support (with external control), 7. +10K (with external control)"
+r,,RunTimePump1Minutes,RunTimePump1_Minutes,,,,"1A00",,,minutes0,,,Runtime of solar pump in minutes
+r,,RunTimePump1Hours,RunTimePump1_Hours,,,,"1B00",,,hoursum2,,,Runtime of solar pump in hours
+r,,ExternalHwcRequest,ExternalDHWRequest,,,,"1C00",,,onoff,,,0: No request; 1: Request
+r,,ExternalHcRequest,ExternalCHRequest,,,,"1D00",,,onoff,,,0: No request; 1: Request
+r,,ExternalHwcTempDesired,ExternalDHWSetpoint,,,,"1E00",,,desiredtemp,,,Requested temperature for DHW
+r,,ExternalHcTempDesired,ExternalCHSetpoint,,,,"1F00",,,desiredtemp,,,Requested temperature for CH
+r,,CurrentASCStateforExternals,CurrentASCStateforExternals,,,,"2000",,,UCH,,,1:OFF 2: Proofing 3:DHWLoading 4:CHLoading 5:Overtemperature
+r,,CurrentASCStateforASI,CurrentASCStateforASI,,,,"2100",,,UCH,,,1: Standby 2:Proofing 3:StorageLoading 4:Error_System_blocked
+r,,DateAndTimeIsSet,DateAndTimeIsSet,,,,"2200",,,onoff,,,0: Date and Time is not set; 1: Date and Time is set
+r;wi,,Time,time,,,,"2300",,,time,,,
+r;wi,,Date,date,,,,"2400",,,date,,,
+r,,FlowSensorFrequency,FlowSensorFrequency,,,,"2D00",,,UIN,,,
+r,,CurrentFlow,CurrentFlow,,,,"2E00",,,UIN,,ml / min,Flow thru buffer circuit if loading the storage
+r,,Variante,Variante,,,,"3000",,,UCH,,,1: VMS 30 2: VPM 20 S 3: VPM 60 S (identified by resistor in harness)
+r,,CurrentSystemMode,CurrentSystemMode,,,,"3300",,,UCH,,,"1: Standalone, 3: With external control"
+r,,InternalHwcTempDesired,InternalDHWSetpoint,,,,"3500",,,UCH,,,Temperature target for DHW loading if solar module is in stand alone appliccation without external control
+r,,InternalHcTempDesired,InternalCHSetpoint,,,,"3600",,,UCH,,,Temperature target for CW loading if solar module is in stand alone appliccation without external control
+r,,ASIDetected,ASIDetected,,,,"3800",,,onoff,,,
+r;wi,,CountryZone,CountryZone,,,,"3900",,,UCH,,,Location for calculation of sun calender. See list in control manual (default = 2: Germany)
+r,,RequestForExternalDateTimeSetting,RequestForExternalDateTimeSetting,,,,"3A00",,,onoff,,,0: Time and Date is set; 1: Time and Date is not set
+r;wi,,YieldCurrentDay,SolarYieldCurrentDay,,,,"3B00",,,energy,,,Accumulated solar gain from 00:00 to 24:00 if time is set
+r,,ForceStartSolPumpKick,ForceStartSolarPumpKick,,,,"4700",,,onoff,,,"Start solar pump for max. 5min to check collector temperature 0: OFF, 1: ON"
+r,,MonitorMatlabState,MonitorMatlabState,,,,"4800",,,UCH,,,main states: 201: Waiting; 209: Loading; 41: Night Modus
+r,,RunTimeBufferPumpMinutes,RunTimeBufferPump_Minutes,,,,"4B00",,,minutes0,,,Runtime of buffer pump in minutes
+r,,RunTimeBufferPumpHours,RunTimeBufferPump_Hours,,,,"4C00",,,hoursum2,,,Runtime of buffer pump in hours
+r,,MonitorOverheatState,MonitorOverheatState,,,,"4F00",,,UCH,,,111: Waiting; 112 and 113: Temperature to high; 220 and 221: In Overheat protection
+r;wi,,YieldTotal,SolarYieldTotal,,,,"5600",,,energy4,,,Accumulated solar gain since installation
+!include,errors.inc,,,,,,,,,,,,
diff --git a/ebusd-2.1.x/en/vaillant/15.720.csv b/ebusd-2.1.x/en/vaillant/15.720.csv
new file mode 120000
index 00000000..9c67bc32
--- /dev/null
+++ b/ebusd-2.1.x/en/vaillant/15.720.csv
@@ -0,0 +1 @@
+15.700.csv
\ No newline at end of file
diff --git a/ebusd-2.1.x/en/vaillant/15.basv.csv b/ebusd-2.1.x/en/vaillant/15.basv.csv
new file mode 120000
index 00000000..9c67bc32
--- /dev/null
+++ b/ebusd-2.1.x/en/vaillant/15.basv.csv
@@ -0,0 +1 @@
+15.700.csv
\ No newline at end of file
diff --git a/ebusd-2.1.x/en/vaillant/15.uih.csv b/ebusd-2.1.x/en/vaillant/15.uih.csv
index 408c2f4b..aa4aa7c0 100644
--- a/ebusd-2.1.x/en/vaillant/15.uih.csv
+++ b/ebusd-2.1.x/en/vaillant/15.uih.csv
@@ -49,6 +49,7 @@ r;wi,,EhpHeatBufferAvailable,EhpHeatBufferAvailable,,,,"5C00",,,onoff,,,heat buf
 [SW>=362]r,,reserve1,reserve 1,,,,"9D00",,,UCH,,,for future use
 # ##### HC Names and Tel No #####,,,,,,,,,,,,,
 r;w,,HcName2,aaucHcNames CH2,,,,"4108",,,STR:11,,,name of CH2
+r;w,,HcName3,aaucHcNames CH3,,,,"4110",,,STR:11,,,name of CH3
 r;w,,HcName4,aaucHcNames CH4,,,,"4118",,,STR:11,,,name of CH4
 r;w,,HcName5,aaucHcNames CH5,,,,"4120",,,STR:11,,,name of CH5
 r;w,,HcName6,aaucHcNames CH6,,,,"4128",,,STR:11,,,name of CH6
diff --git a/ebusd-2.1.x/en/vaillant/_templates.csv b/ebusd-2.1.x/en/vaillant/_templates.csv
index f022a38c..3f7de969 100644
--- a/ebusd-2.1.x/en/vaillant/_templates.csv
+++ b/ebusd-2.1.x/en/vaillant/_templates.csv
@@ -33,7 +33,7 @@ hcmode,UCH,0=auto;1=off;2=heat;2=water,,boiler mode
 hcmode2,UCH,0=off;3=heat;4=water,,boiler mode
 mcmode,UCH,0=disabled;1=on;2=off;3=auto;4=eco;5=low,,mixer mode
 mctype,UCH,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool,,mixer type
-mctype7,BI0:7,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool,,mixer type
+mctype7,BI0:7,0=inactive;1=mixer;2=fixed;3=hwc;4=returnincr;5=pool;6=circulation,,mixer type
 hwcmode,UCH,0=disabled;1=on;2=off;3=auto,,hot water mode
 hwcmode2,UCH,0=off;1=on;2=auto;3=manual,,hot water mode
 mixer,UCH,0=off;1=open;2=close,,mixer State
@@ -75,7 +75,7 @@ energy4,ULG,,kWh,
 cntstarts,ULG,,,start count
 cntstarts2,UIN,,,start count
 pumppow,UCH,0=0;1=1;2=2;3=3;4=4;5=5;6=6;7=off,,pump power
-pumpstate,UCH,0=off;1=on;2=overrun,,pump state
+pumpstate,UCH,0=off;1=on;2=overrun;4=hwc,,pump state
 dcfstate,UCH,0=nosignal;1=ok;2=sync;3=valid,,DCF receiver state
 phaseok,UCH,0=error;7=ok,,phase state
 switchvalve,UCH,0=heat;1=water,,valve position
diff --git a/ebusd-2.1.x/en/vaillant/bai.0010015600.inc b/ebusd-2.1.x/en/vaillant/bai.0010015600.inc
index c6f29ea0..bc5a6101 100644
--- a/ebusd-2.1.x/en/vaillant/bai.0010015600.inc
+++ b/ebusd-2.1.x/en/vaillant/bai.0010015600.inc
@@ -61,7 +61,7 @@ r,,ReturnTempExternal,Ext. return temperature,,,,"6B00",,,tempsensor,,,External
 r,,FloorHeatingContact,Floor heating contact,,,,"7000",,,onoff,,,Floor heating contact,,,
 r,,Templimiter,Temperature limiter sensor,,,,"7700",,,UCH,240=off;15=on,,Feedback of the temperature limiter sensor,,,
 r,,EbusVoltage,eBUS voltage,,,,"7F00",,,onoff,,,eBUS voltage feedback,,,
-r,,FluegasvalveOpen,Flue flap open,,,,"8900",,,onoff,,,Exhaust (flue) flap open,,,
+r,,FluegasvalveOpen,Flue flap open,,,,"8900",,,yesno,,,Exhaust (flue) flap open,,,
 r,,Testbyte,Testbyte,,,,"9900",,,UCH,,,Testbyte (relevant for testers),,,
 r,,DSN,DSN,,,,"9A00",,,UIN,,,DSN: Device Specific number,,,
 r,,TargetFanSpeedOutput,Target fan speed,,,,"9F00",,,UIN,,1/min,Target fan speed,,,
@@ -98,8 +98,8 @@ r,,DeactivationsTemplimiter,d.60 Shutdowns by the temp limiter,,,,"2000",,,UCH,,
 r,,DeactivationsIFC,d.61 Ignition failures,,,,"1F00",,,UCH,,,Number of ignition failures (unsuccessful last-run or faulty flame signal),,,
 r,,averageIgnitiontime,d.64 Average ignition time,,,,"2D00",,,UCH,10,s,Average ignition time,,,
 r,,maxIgnitiontime,d.65 Maximum ignition time,,,,"2C00",,,UCH,10,s,Maximum ignition time,,,
-r,,CounterStartattempts1,d.68 Failed ignition (1nd attempt),,,,"6E00",,,temp0,,,Number of unsuccessful ignition attempts (in the first attempt),,,
-r,,CounterStartattempts2,d.69 Failed ignition (2nd attempt),,,,"6F00",,,temp0,,,Number of unsuccessful ignition attempts (in the second attempt),,,
+r,,CounterStartattempts1,d.68 Failed ignition (1nd attempt),,,,"6E00",,,UCH,,,Number of unsuccessful ignition attempts (in the first attempt),,,
+r,,CounterStartattempts2,d.69 Failed ignition (2nd attempt),,,,"6F00",,,UCH,,,Number of unsuccessful ignition attempts (in the second attempt),,,
 r;wi,,FlowsetHcMax,d.71 CH max flow temperature,,,,"0E04",,,temp,,,Setting the maximum flow setpoint in heating mode (with left-hand stop of the potentiometer),,,
 [SW>=413]r;wi,,APCLegioProtection,d.74 APC_LegioProtection,,,,"9704",,,UCH,,,Legionella protection for internal storage,,,
 r;wi,,StorageLoadTimeMax,d.75 Maximum storage time,,,,"6600",,,minutes0,,,Maximum water storing time for storage without own controls,,,
diff --git a/ebusd-2.1.x/en/vaillant/broadcast.csv b/ebusd-2.1.x/en/vaillant/broadcast.csv
index a931c386..1ac975c9 100644
--- a/ebusd-2.1.x/en/vaillant/broadcast.csv
+++ b/ebusd-2.1.x/en/vaillant/broadcast.csv
@@ -1,6 +1,7 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m;s),type / templates,divider / values,unit,comment,field2,part (m;s),type / templates,divider / values,unit,comment,field3,part (m;s),type / templates,divider / values,unit,comment
 *b,broadcast,,,,"FE","B516",,,,,,,,,,,,,,,,,,,
-b,,vdatetime,date/time,,,,"00",time,,BTI,,,,date,,BDA,,,,,,,,,
+*wi,broadcast,,,,"FE","B516",,,,,,,,,,,,,,,,,,,
+b;wi,,vdatetime,date/time,,,,"00",time,,BTI,,,,date,,BDA,,,,,,,,,
 b,,outsidetemp,outside temperature,,,,"01",,,temp2,,,,,,,,,,,,,,,
 *b,broadcast,,,,"FE","B505",,,,,,,,,,,,,,,,,,,
 b,,hwcStatus,state hot water,,,,"27",,,onoff,,,,VF1,,temp0,,,,,,onoff,,,
diff --git a/ebusd-2.1.x/en/vaillant/hcmode.inc b/ebusd-2.1.x/en/vaillant/hcmode.inc
index 4201093b..02529a42 100644
--- a/ebusd-2.1.x/en/vaillant/hcmode.inc
+++ b/ebusd-2.1.x/en/vaillant/hcmode.inc
@@ -10,7 +10,7 @@ r,,Status16,Outside temperature,,,,16,,,temp,,,
 uw,,SetMode,Operation Mode,,,,00,,,hcmode,,,,flowtempdesired,,temp1,,,,hwctempdesired,,temp1,,,,hwcflowtempdesired,,temp0,,,,,,IGN:1,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,,,IGN:1,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2,,,,
 #potential last byte: currentmode,s,UCH,0=off;1=standby;2=heat;3=water,,
 r,,Status01,Vorlauftemperatur/Rücklauftemperatur/Aussentemperatur/WW Temperatur/Speichertemperatur/Pumpenstatus,,,,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate,,,
-r,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTEMP/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
+r,,Status02,Betriebsart/Maximaltemperatur/ReglerCurrentTemp/Maximaltemperatur/ReglerCurrentTemp,,,,02,,,hwcmode;temp0;temp1;temp0;temp1,,,
 r,,Status,Status,,,,03,,,temp;press;press;hcmode2;HEX,,,
 
 *uw,,,,,,"B512",,,,,,,