diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index 860add5f..9ff298b0 100644
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -26,12 +26,12 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-              <!--value>http://192.168.2.4/LockingService/LockingService.svc</value-->
-                <value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
+              <value>http://192.168.2.4/LockingService/LockingService.svc</value>
+                <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-              <!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
-                <value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
+              <value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
+              <!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
index dcb4ff9d..df665f9b 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
@@ -66,9 +66,11 @@ namespace ENI2.DetailViewControls
                 sec = this._secMessage.Elements[0] as SEC;
             if (sec == null)
             {
-                sec = new SEC();
-                sec.MessageCore = this.Core;
-                sec.MessageHeader = this._secMessage;
+                sec = new SEC
+                {
+                    MessageCore = this.Core,
+                    MessageHeader = this._secMessage
+                };
                 _secMessage.Elements.Add(sec);
             }
 
@@ -103,6 +105,8 @@ namespace ENI2.DetailViewControls
             this.checkBoxSECSimplification.Unchecked += CheckBoxSECSimplification_Checked;
             this.checkBoxKielCanalPassagePlanned.Checked += CheckBoxKielCanalPassagePlanned_Checked;
 
+            this.CheckBoxKielCanalPassagePlanned_Checked(null, null);
+
             #endregion
 
         }
@@ -122,8 +126,10 @@ namespace ENI2.DetailViewControls
 
         private void DataGridShip2ShipActivities_CreateRequested()
         {
-            EditShip2ShipActivitiesDialog epd = new EditShip2ShipActivitiesDialog();
-            epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();            
+            EditShip2ShipActivitiesDialog epd = new EditShip2ShipActivitiesDialog
+            {
+                ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled()
+            };
             epd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
             epd.ShipToShipActivity.SEC = this._sec;            
 
@@ -133,9 +139,11 @@ namespace ENI2.DetailViewControls
                 if(!this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Contains(epd.ShipToShipActivity))                
                     this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(epd.ShipToShipActivity);
                 this.dataGridShip2ShipActivities.Items.Refresh();
-                epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
-                epd.ShipToShipActivity.SEC = this._sec;
-                epd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
+                epd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled
+                {
+                    SEC = this._sec,
+                    Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
+                };
                 this.SublistElementChanged(Message.NotificationClass.SEC);
             };
 
@@ -163,17 +171,21 @@ namespace ENI2.DetailViewControls
 
         private void DataGridShip2ShipActivities_EditRequested(DatabaseEntity obj)
         {
-            EditShip2ShipActivitiesDialog ecpd = new EditShip2ShipActivitiesDialog();
-            ecpd.ShipToShipActivity = obj as ShipToShipActivitiesDuringLastTenPortFacilitiesCalled;
+            EditShip2ShipActivitiesDialog ecpd = new EditShip2ShipActivitiesDialog
+            {
+                ShipToShipActivity = obj as ShipToShipActivitiesDuringLastTenPortFacilitiesCalled
+            };
             ecpd.AddClicked += () =>
             {
                 ecpd.CopyValuesToEntity();
                 if (!_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Contains(ecpd.ShipToShipActivity))
                     _sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(ecpd.ShipToShipActivity);
                 this.dataGridShip2ShipActivities.Items.Refresh();
-                ecpd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
-                ecpd.ShipToShipActivity.SEC = this._sec;
-                ecpd.ShipToShipActivity.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
+                ecpd.ShipToShipActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled
+                {
+                    SEC = this._sec,
+                    Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(_sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
+                };
                 this.SublistElementChanged(Message.NotificationClass.SEC);
             };
             if (ecpd.ShowDialog() ?? false)
@@ -196,8 +208,10 @@ namespace ENI2.DetailViewControls
 
         private void DataGridLast10PortFacilities_CreateRequested()
         {
-            EditLast10PortFacilitiesDialog epd = new EditLast10PortFacilitiesDialog();
-            epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled();            
+            EditLast10PortFacilitiesDialog epd = new EditLast10PortFacilitiesDialog
+            {
+                LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled()
+            };
             epd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
             epd.LastTenPortFacilitiesCalled.SEC = this._sec;
 
@@ -208,9 +222,11 @@ namespace ENI2.DetailViewControls
                     this._sec.LastTenPortFacilitesCalled.Add(epd.LastTenPortFacilitiesCalled);
                 this.dataGridLast10PortFacilities.Items.Refresh();
 
-                epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled();
-                epd.LastTenPortFacilitiesCalled.SEC = this._sec;
-                epd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
+                epd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled
+                {
+                    SEC = this._sec,
+                    Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled)
+                };
                 this.SublistElementChanged(Message.NotificationClass.SEC);
             };
 
@@ -238,17 +254,21 @@ namespace ENI2.DetailViewControls
 
         private void DataGridLast10PortFacilities_EditRequested(DatabaseEntity obj)
         {
-            EditLast10PortFacilitiesDialog ecpd = new EditLast10PortFacilitiesDialog();
-            ecpd.LastTenPortFacilitiesCalled = obj as LastTenPortFacilitiesCalled;
+            EditLast10PortFacilitiesDialog ecpd = new EditLast10PortFacilitiesDialog
+            {
+                LastTenPortFacilitiesCalled = obj as LastTenPortFacilitiesCalled
+            };
             ecpd.AddClicked += () =>
             {
                 ecpd.CopyValuesToEntity();
                 if (!_sec.LastTenPortFacilitesCalled.Contains(ecpd.LastTenPortFacilitiesCalled))
                     _sec.LastTenPortFacilitesCalled.Add(ecpd.LastTenPortFacilitiesCalled);
                 this.dataGridLast10PortFacilities.Items.Refresh();
-                ecpd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled();
-                ecpd.LastTenPortFacilitiesCalled.SEC = this._sec;
-                ecpd.LastTenPortFacilitiesCalled.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled);
+                ecpd.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled
+                {
+                    SEC = this._sec,
+                    Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(_sec.LastTenPortFacilitesCalled)
+                };
                 this.SublistElementChanged(Message.NotificationClass.SEC);
             };
             if (ecpd.ShowDialog() ?? false)
@@ -305,8 +325,11 @@ namespace ENI2.DetailViewControls
 
         private void buttonImportExcel_Click(object sender, RoutedEventArgs e)
         {
-            OpenFileDialog ofd = new OpenFileDialog();
-            ofd.Filter = "Excel Files|*.xls;*.xlsx";
+            OpenFileDialog ofd = new OpenFileDialog
+            {
+                Filter = "Excel Files|*.xls;*.xlsx"
+            };
+
             if (ofd.ShowDialog() ?? false)
             {
                 FileStream stream = null;
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index f2ba4898..42a9f541 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>5.0.13.%2a</ApplicationVersion>
+    <ApplicationVersion>5.0.14.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 6ecbbcd5..469236c4 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 0c01e032..4532a871 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("5.0.13")]
+[assembly: AssemblyInformationalVersion("5.0.14")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2018 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index eb05d3b8..b168e724 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("5.0.13.*")]
+[assembly: AssemblyVersion("5.0.14.*")]
 
diff --git a/nsw/Source/misc/db.sqlite b/nsw/Source/misc/db.sqlite
index b1c2ccae..ec6df379 100644
Binary files a/nsw/Source/misc/db.sqlite and b/nsw/Source/misc/db.sqlite differ