diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index 36e38948..7ed44e2e 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.24/LockingService/LockingService.svc</value-->
-				<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
+				<value>http://192.168.2.24/LockingService/LockingService.svc</value>
+					<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
-				<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
+				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
+					<!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index c7ac08a7..69190627 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -328,36 +328,61 @@ namespace ENI2.DetailViewControls
         {
 
             this.textBox_AgentCity.Text = this._undoTemplate.AgentCity;
+            this.textBox_AgentCity.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentCompanyName.Text = this._undoTemplate.AgentCompanyName;
+            this.textBox_AgentCompanyName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentCountry.Text = this._undoTemplate.AgentCountry;
+            this.textBox_AgentCountry.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentEMail.Text = this._undoTemplate.AgentEMail;
+            this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFax.Text = this._undoTemplate.AgentFax;
+            this.textBox_AgentFax.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFirstName.Text = this._undoTemplate.AgentFirstName;
+            this.textBox_AgentFirstName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentLastName.Text = this._undoTemplate.AgentLastName;
+            this.textBox_AgentLastName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentPhone.Text = this._undoTemplate.AgentPhone;
+            this.textBox_AgentPhone.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentPostalCode.Text = this._undoTemplate.AgentPostalCode;
+            this.textBox_AgentPostalCode.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentStreetAndNumber.Text = this._undoTemplate.AgentStreetAndNumber;
+            this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
 
             this.buttonUndoTemplate.IsEnabled = false; // can't undo after undo
         }      
 
         private void buttonSetTemplate_Click(object sender, RoutedEventArgs e)
         {
+            if (this._currentTemplate == null) return;
+
             this._undoTemplate = createFromCurrentText(null, null);
 
             this.textBox_AgentCity.Text = this._currentTemplate.AgentCity;
+            this.textBox_AgentCity.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentCompanyName.Text = this._currentTemplate.AgentCompanyName;
+            this.textBox_AgentCompanyName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentCountry.Text = this._currentTemplate.AgentCountry;
+            this.textBox_AgentCountry.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentEMail.Text = this._currentTemplate.AgentEMail;
+            this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFax.Text = this._currentTemplate.AgentFax;
+            this.textBox_AgentEMail.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentFirstName.Text = this._currentTemplate.AgentFirstName;
+            this.textBox_AgentFirstName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentLastName.Text = this._currentTemplate.AgentLastName;
+            this.textBox_AgentLastName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentPhone.Text = this._currentTemplate.AgentPhone;
+            this.textBox_AgentPhone.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentPostalCode.Text = this._currentTemplate.AgentPostalCode;
+            this.textBox_AgentPostalCode.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentStreetAndNumber.Text = this._currentTemplate.AgentStreetAndNumber;
+            this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
 
             this.buttonUndoTemplate.IsEnabled = true;
-
+            this.buttonSetTemplate.IsEnabled = false;
+            this.comboBox_AgentTemplate.SelectedItem = null;
+            this.textBoxTemplateTitle.Text = "";
+            this._currentTemplate = null;
         }
 
         private AGNT_Template createFromCurrentText(string title, AGNT_Template existingTemplate)
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 43c05501..84442a58 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,7 +35,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.5.0.%2a</ApplicationVersion>
+    <ApplicationVersion>6.5.3.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 7fb90cd4..a06265d2 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf b/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf
index 07c1687b..2696339b 100644
Binary files a/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf and b/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf differ
diff --git a/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf b/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf
index af4ac7e8..ef8e0da5 100644
Binary files a/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf and b/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf differ
diff --git a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
index 02e911e3..132ef5e0 100644
--- a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
+++ b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
@@ -1654,14 +1654,14 @@ namespace bsmd.ReportGenerator
                 table.AddColumn(Unit.FromCentimeter(2.5));
                 table.AddColumn(Unit.FromCentimeter(1.0));
                 table.AddColumn(Unit.FromCentimeter(2.0));
-                table.AddColumn(Unit.FromCentimeter(1.5));
+                table.AddColumn(Unit.FromCentimeter(1.8));
                 table.AddColumn(Unit.FromCentimeter(1.5));
                 table.AddColumn(Unit.FromCentimeter(2.5));
                 table.AddColumn(Unit.FromCentimeter(1.5));
                 table.AddColumn(Unit.FromCentimeter(1.5));
                 table.AddColumn(Unit.FromCentimeter(1.5));
                 table.AddColumn(Unit.FromCentimeter(2.2));
-                table.AddColumn(Unit.FromCentimeter(6.7));
+                table.AddColumn(Unit.FromCentimeter(6.4));
 
                 Row hRow = table.AddRow();
                 hRow.Format.Font.Bold = true;
@@ -1850,13 +1850,13 @@ namespace bsmd.ReportGenerator
 
                 table.AddColumn(Unit.FromCentimeter(2.5));
                 table.AddColumn(Unit.FromCentimeter(3.0));
-                table.AddColumn(Unit.FromCentimeter(1.5));
+                table.AddColumn(Unit.FromCentimeter(2.0));
                 table.AddColumn(Unit.FromCentimeter(2.0));
                 table.AddColumn(Unit.FromCentimeter(3.0));
                 table.AddColumn(Unit.FromCentimeter(2.5));
                 table.AddColumn(Unit.FromCentimeter(1.5));
                 table.AddColumn(Unit.FromCentimeter(1.5));
-                table.AddColumn(Unit.FromCentimeter(8.5));
+                table.AddColumn(Unit.FromCentimeter(8.0));
 
                 Row hRow = table.AddRow();
                 hRow.Format.Font.Bold = true;