diff --git a/csharp/App/Backend/Program.cs b/csharp/App/Backend/Program.cs
index 3b7979293..3373101be 100644
--- a/csharp/App/Backend/Program.cs
+++ b/csharp/App/Backend/Program.cs
@@ -7,9 +7,6 @@ namespace InnovEnergy.App.Backend;
 
 public static class Program
 {
-    
-        
-    
     public static void Main(String[] args)
     {
         //Db.CreateFakeRelations();
diff --git a/csharp/App/SaliMax/src/Ess/StatusRecord.cs b/csharp/App/SaliMax/src/Ess/StatusRecord.cs
index 7a2b2a447..2fa10dd19 100644
--- a/csharp/App/SaliMax/src/Ess/StatusRecord.cs
+++ b/csharp/App/SaliMax/src/Ess/StatusRecord.cs
@@ -12,20 +12,20 @@ namespace InnovEnergy.App.SaliMax.Ess;
 
 public record StatusRecord
 {   
-    public AcDcDevicesRecord   AcDc                { get; init; } = null!; 
-    public DcDcDevicesRecord   DcDc                { get; init; } = null!; 
-    public Battery48TlRecords  Battery             { get; init; } = null!;
-    public EmuMeterRegisters?  GridMeter           { get; init; } 
-    public EmuMeterRegisters?  LoadOnAcIsland      { get; init; } 
-    public AcPowerDevice?      LoadOnAcGrid        { get; init; } = null!;
-    public AcPowerDevice?      PvOnAcGrid          { get; init; } = null!;
-    public AcPowerDevice?      PvOnAcIsland        { get; init; } = null!;
-    public AcPowerDevice?      AcGridToAcIsland    { get; init; } = null!;
-    public DcPowerDevice?      LoadOnDc            { get; init; } = null!;
-    public RelaysRecord?       Relays              { get; init; } 
-    public AmptStatus          PvOnDc              { get; init; } = null!;
-    public Config              Config              { get; init; } = null!;
-    public EssControl          EssControl          { get; set; }  = null!;
-    public StateMachine        StateMachine        { get; } = new StateMachine();
+    public required AcDcDevicesRecord   AcDc                { get; init; }  
+    public required DcDcDevicesRecord   DcDc                { get; init; }  
+    public required Battery48TlRecords  Battery             { get; init; } 
+    public required EmuMeterRegisters?  GridMeter           { get; init; } 
+    public required EmuMeterRegisters?  LoadOnAcIsland      { get; init; } 
+    public required AcPowerDevice?      LoadOnAcGrid        { get; init; } 
+    public required AcPowerDevice?      PvOnAcGrid          { get; init; } 
+    public required AcPowerDevice?      PvOnAcIsland        { get; init; } 
+    public required AcPowerDevice?      AcGridToAcIsland    { get; init; } 
+    public required DcPowerDevice?      LoadOnDc            { get; init; } 
+    public required RelaysRecord?       Relays              { get; init; } 
+    public required AmptStatus          PvOnDc              { get; init; } 
+    public required Config              Config              { get; init; } 
+    public required EssControl          EssControl          { get; init; }  
+    public required StateMachine        StateMachine        { get; init; } 
     
 }
diff --git a/csharp/App/SaliMax/src/S3Config.cs b/csharp/App/SaliMax/src/S3Config.cs
index 2e04acd81..c0d2cd388 100644
--- a/csharp/App/SaliMax/src/S3Config.cs
+++ b/csharp/App/SaliMax/src/S3Config.cs
@@ -9,12 +9,12 @@ namespace InnovEnergy.App.SaliMax;
 
 public record S3Config
 {
-    public String Bucket      { get; init; } = "";
-    public String Region      { get; init; } = "";
-    public String Provider    { get; init; } = "";
-    public String Key         { get; init; } = "";
-    public String Secret      { get; init; } = "";
-    public String ContentType { get; init; } = "";
+    public required String Bucket      { get; init; } 
+    public required String Region      { get; init; } 
+    public required String Provider    { get; init; } 
+    public required String Key         { get; init; } 
+    public required String Secret      { get; init; } 
+    public required String ContentType { get; init; } 
 
     public String Host =>  $"{Bucket}.{Region}.{Provider}";
     public String Url  =>  $"https://{Host}";
diff --git a/csharp/Lib/Channels/Stages/Channel.cs b/csharp/Lib/Channels/Stages/Channel.cs
index 6bed3881b..b595ba2ad 100644
--- a/csharp/Lib/Channels/Stages/Channel.cs
+++ b/csharp/Lib/Channels/Stages/Channel.cs
@@ -4,8 +4,8 @@ namespace InnovEnergy.Lib.Channels.Stages;
 
 public class Channel<Tx, Rx>
 {
-    public AsyncAction<Tx> Write { get; init; } = _  => throw new NotImplementedException(nameof(Write));
-    public Async<Rx>       Read  { get; init; } = () => throw new NotImplementedException(nameof(Read));
+    public required AsyncAction<Tx> Write { get; init; } 
+    public required Async<Rx>       Read  { get; init; } 
     
     public Channel<T, R> Map<T, R>(Stage<T, Tx, Rx, R> stage)
     {
diff --git a/csharp/Lib/Channels/Stages/ConnectedChannel.cs b/csharp/Lib/Channels/Stages/ConnectedChannel.cs
index 36298420e..568720eca 100644
--- a/csharp/Lib/Channels/Stages/ConnectedChannel.cs
+++ b/csharp/Lib/Channels/Stages/ConnectedChannel.cs
@@ -4,9 +4,9 @@ namespace InnovEnergy.Lib.Channels.Stages;
 
 public class ConnectedChannel<Tx, Rx> : Channel<Tx,Rx>, IAsyncDisposable
 {
-    public Func<Boolean> IsOpen { get; init; } = () => throw new NotImplementedException(nameof(IsOpen));
-    public AsyncAction   Open   { get; init; } = () => throw new NotImplementedException(nameof(Open));
-    public AsyncAction   Close  { get; init; } = () => throw new NotImplementedException(nameof(Close));
+    public required Func<Boolean> IsOpen { get; init; } 
+    public required AsyncAction   Open   { get; init; } 
+    public required AsyncAction   Close  { get; init; } 
     
     public async ValueTask DisposeAsync() => await Close();
 }
diff --git a/csharp/Lib/Devices/AMPT/AmptCommunicationUnitStatus.cs b/csharp/Lib/Devices/AMPT/AmptCommunicationUnitStatus.cs
index e9a95ea44..7031d9e77 100644
--- a/csharp/Lib/Devices/AMPT/AmptCommunicationUnitStatus.cs
+++ b/csharp/Lib/Devices/AMPT/AmptCommunicationUnitStatus.cs
@@ -1,16 +1,18 @@
 namespace InnovEnergy.Lib.Devices.AMPT;
 
+
+// not used ATM
 public class AmptCommunicationUnitStatus 
 {
-    public UInt32  Sid       { get; init; }                    // A well-known value 0x53756e53, uniquely identifies this as a SunSpec Modbus Map                                             
-    public UInt16  IdSunSpec { get; init; }                    // A well-known value 1, uniquely identifies this as a SunSpec Common Model  
+    public required UInt32  Sid       { get; init; }                    // A well-known value 0x53756e53, uniquely identifies this as a SunSpec Modbus Map                                             
+    public required UInt16  IdSunSpec { get; init; }                    // A well-known value 1, uniquely identifies this as a SunSpec Common Model  
     
-    public String Manufacturer  { get; init; }  = "undefined"; // A well-known value registered with SunSpec for compliance: "Ampt"
-    public String Model         { get; init; }  = "undefined"; // Manufacturer specific value "Communication Unit" 
-    public String Version       { get; init; }  = "undefined"; // Software Version      
-    public String SerialNumber  { get; init; }  = "undefined"; // Manufacturer specific value     
-    public Int16  DeviceAddress { get; init; }                 // Modbus Device ID
-    public UInt16 IdVendor      { get; init; }                 // Ampt SunSpec Vendor Code 64050        
+    public required String Manufacturer  { get; init; }   // A well-known value registered with SunSpec for compliance: "Ampt"
+    public required String Model         { get; init; }   // Manufacturer specific value "Communication Unit" 
+    public required String Version       { get; init; }   // Software Version      
+    public required String SerialNumber  { get; init; }   // Manufacturer specific value     
+    public required Int16  DeviceAddress { get; init; }   // Modbus Device ID
+    public required UInt16 IdVendor      { get; init; }   // Ampt SunSpec Vendor Code 64050        
 
-    public IReadOnlyList<AmptStatus> Devices { get; init; } = Array.Empty<AmptStatus>();
+    public required IReadOnlyList<AmptStatus> Devices { get; init; } 
 }
\ No newline at end of file
diff --git a/csharp/Lib/Protocols/DBus/Daemon/MatchRule.cs b/csharp/Lib/Protocols/DBus/Daemon/MatchRule.cs
index fb317807b..b42f8b03b 100644
--- a/csharp/Lib/Protocols/DBus/Daemon/MatchRule.cs
+++ b/csharp/Lib/Protocols/DBus/Daemon/MatchRule.cs
@@ -21,13 +21,13 @@ public interface IMatchRule
 
 public record MatchRule : IMatchRule
 {
-    public MessageType?  Type          { get; init; } = default;
-    public String?       Interface     { get; init; } = default;
-    public String?       Member        { get; init; } = default;
-    public ObjectPath?   Path          { get; init; } = default;
-    public ObjectPath?   PathNamespace { get; init; } = default;
-    public String?       Sender        { get; init; } = default;
-    public String?       Destination   { get; init; } = default;
+    public MessageType?  Type          { get; init; } 
+    public String?       Interface     { get; init; } 
+    public String?       Member        { get; init; } 
+    public ObjectPath?   Path          { get; init; } 
+    public ObjectPath?   PathNamespace { get; init; } 
+    public String?       Sender        { get; init; } 
+    public String?       Destination   { get; init; } 
     public Boolean       Eavesdrop     { get; init; } = false;
 
     public override String ToString() => this.Rule();
diff --git a/csharp/Lib/Units/Composite/Ac1Bus.cs b/csharp/Lib/Units/Composite/Ac1Bus.cs
index abdc15110..deff1105b 100644
--- a/csharp/Lib/Units/Composite/Ac1Bus.cs
+++ b/csharp/Lib/Units/Composite/Ac1Bus.cs
@@ -5,10 +5,10 @@ public sealed class Ac1Bus
     private Ac1Bus()
     {}
 
-    public Voltage   Voltage   { get; private init; } = null!;
-    public Current   Current   { get; private init; } = null!;
-    public AcPower   Power     { get; private init; } = null!;
-    public Frequency Frequency { get; private init; } = null!;
+    public required Voltage   Voltage   { get; init; } 
+    public required Current   Current   { get; init; } 
+    public required AcPower   Power     { get; init; } 
+    public required Frequency Frequency { get; init; } 
 
     public static Ac1Bus FromVoltageCurrentFrequencyPhi(Double voltageRms,
                                                         Double currentRms,
diff --git a/csharp/Lib/Units/Composite/Ac3Bus.cs b/csharp/Lib/Units/Composite/Ac3Bus.cs
index 884fcc690..03d20825d 100644
--- a/csharp/Lib/Units/Composite/Ac3Bus.cs
+++ b/csharp/Lib/Units/Composite/Ac3Bus.cs
@@ -6,11 +6,11 @@ public sealed class Ac3Bus
 {
     private Ac3Bus() {}
 
-    public AcPhase   L1        { get; private init; } = null!;
-    public AcPhase   L2        { get; private init; } = null!;
-    public AcPhase   L3        { get; private init; } = null!;
-    public AcPower   Power     { get; private init; } = null!;
-    public Frequency Frequency { get; private init; } = null!;
+    public required AcPhase   L1        { get; init; }
+    public required AcPhase   L2        { get; init; }
+    public required AcPhase   L3        { get; init; }
+    public required AcPower   Power     { get; init; }
+    public required Frequency Frequency { get; init; }
 
     public static Ac3Bus FromPhasesAndFrequency(AcPhase l1,
                                                 AcPhase l2,
diff --git a/csharp/Lib/Units/Composite/AcPhase.cs b/csharp/Lib/Units/Composite/AcPhase.cs
index acacd1343..4dcb6bca9 100644
--- a/csharp/Lib/Units/Composite/AcPhase.cs
+++ b/csharp/Lib/Units/Composite/AcPhase.cs
@@ -7,9 +7,9 @@ public sealed class AcPhase
 {
     private AcPhase(){}
     
-    public Voltage Voltage { get; private init; } = null!;
-    public Current Current { get; private init; } = null!;
-    public AcPower Power   { get; private init; } = null!;
+    public required Voltage Voltage { get; init; } 
+    public required Current Current { get; init; } 
+    public required AcPower Power   { get; init; } 
     
     public static AcPhase FromVoltageCurrentPhi(Voltage voltageRms,
                                                 Current currentRms,
diff --git a/csharp/Lib/Units/Composite/AcPower.cs b/csharp/Lib/Units/Composite/AcPower.cs
index e9de3a735..e525233fd 100644
--- a/csharp/Lib/Units/Composite/AcPower.cs
+++ b/csharp/Lib/Units/Composite/AcPower.cs
@@ -8,11 +8,11 @@ public sealed class AcPower
 {
     private AcPower(){}
 
-    public ApparentPower Apparent { get; private init; } = null!;
-    public ActivePower   Active   { get; private init; } = null!;
-    public ReactivePower Reactive { get; private init; } = null!;
-    public Angle         Phi      { get; private init; } = null!;
-    public Double        CosPhi   { get; private init; } 
+    public required ApparentPower Apparent { get; init; } 
+    public required ActivePower   Active   { get; init; } 
+    public required ReactivePower Reactive { get; init; } 
+    public required Angle         Phi      { get; init; } 
+    public required Double        CosPhi   { get; init; } 
     
     public static AcPower FromActiveReactiveApparent(ActivePower activePower, ReactivePower reactivePower, ApparentPower apparentPower)
     {
diff --git a/csharp/Lib/Units/Composite/DcBus.cs b/csharp/Lib/Units/Composite/DcBus.cs
index c75de28ed..28653ea3d 100644
--- a/csharp/Lib/Units/Composite/DcBus.cs
+++ b/csharp/Lib/Units/Composite/DcBus.cs
@@ -6,9 +6,9 @@ public sealed class DcBus
 {
    private DcBus() {}
 
-   public Voltage     Voltage { get; private init; } = null!;
-   public Current     Current { get; private init; } = null!;
-   public ActivePower Power   { get; private init; } = null!;
+   public required Voltage     Voltage { get; init; } 
+   public required Current     Current { get; init; } 
+   public required ActivePower Power   { get; init; } 
 
    public static DcBus FromVoltageCurrent(Voltage voltage, Current current) => new()
    {
diff --git a/csharp/Lib/Units/Energy.cs b/csharp/Lib/Units/Energy.cs
index 0d5412244..fe62a1a55 100644
--- a/csharp/Lib/Units/Energy.cs
+++ b/csharp/Lib/Units/Energy.cs
@@ -2,7 +2,7 @@ namespace InnovEnergy.Lib.Units;
 
 public sealed class Energy : Unit
 {
-    public override String Symbol => "kWh";
+    public override String Symbol => "Wh";
 
     public Energy(Double value) : base(value)
     {
diff --git a/csharp/Lib/Units/Power/ActivePower.cs b/csharp/Lib/Units/Power/ActivePower.cs
index 92a82b431..f451d4f79 100644
--- a/csharp/Lib/Units/Power/ActivePower.cs
+++ b/csharp/Lib/Units/Power/ActivePower.cs
@@ -12,7 +12,6 @@ public sealed class ActivePower : AcPower
     public static implicit operator ActivePower(Double d) => new ActivePower(d);
     public static implicit operator Double(ActivePower d) => d.Value;
     
-    
     public static ActivePower operator -(ActivePower d) => -d.Value;
 }
 
diff --git a/csharp/Lib/Units/Units.cs b/csharp/Lib/Units/Units.cs
index 8d07d3bb6..3946be0a3 100644
--- a/csharp/Lib/Units/Units.cs
+++ b/csharp/Lib/Units/Units.cs
@@ -20,7 +20,8 @@ public static class Units
     public static Frequency     Hz     (this Double value) => value;
     public static Angle         Rad    (this Double value) => value;
     public static Temperature   Celsius(this Double value) => value;
-    public static Energy        KWh    (this Double value) => value;
+    public static Energy        KWh    (this Double value) => value * 1000;
+    public static Energy        Wh     (this Double value) => value;
     
     public static String ToCsv(this Object thing)
     {