diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 0490e0b8..776a4e5a 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
-    <ApplicationVersion>7.0.2.3</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>7.0.3.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI2/EditControls/EditCREWDialog.xaml.cs
index fda9db33..91b20c30 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml.cs
+++ b/ENI2/EditControls/EditCREWDialog.xaml.cs
@@ -47,7 +47,8 @@ namespace ENI2.EditControls
             this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber;
             this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState;
-            this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
+            if(this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue)
+                this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
             // this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO
             // this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
             // this.textBoxEffects.Text = this.CREW.Effects;
diff --git a/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI2/EditControls/EditPasDialog.xaml.cs
index 53494ac0..f4587979 100644
--- a/ENI2/EditControls/EditPasDialog.xaml.cs
+++ b/ENI2/EditControls/EditPasDialog.xaml.cs
@@ -49,7 +49,8 @@ namespace ENI2.EditControls
             this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit;
             this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState;
-            this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
+            if(this.PAS.PassengerIdentityDocumentExpiryDate.HasValue)
+                this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
             // XXX : TODO
             //this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
             //this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 580074c5..9a0c9098 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -466,7 +466,7 @@ namespace ENI2.Excel
             string mouBaltic = isArrival ? "HAZA.MOUBaltic" : "HAZD.MOUBaltic";
             string shipClass = isArrival ? "HAZA.INFShipClass" : "HAZD.INFShipClass";
             HAZ haz = hazMessage.Elements[0] as HAZ;
-            WriteBoolean(noDPGOnBoard, haz.NoDPGOnBoardOnArrival);
+            WriteBoolean(noDPGOnBoard, !haz.NoDPGOnBoardOnArrival); // inverted "logic" in exported sheet
             WriteBoolean(dpgManifestOnBoard, haz.DPGManifestOnBoardOnArrival);
             WriteText(dpgContactFamilyName, haz.DPGContactFamilyName);
             WriteText(dpgContactPhone, haz.DPGContactPhone);
diff --git a/bsmd.hisnord/Request.cs b/bsmd.hisnord/Request.cs
index 1708119a..843eaa00 100644
--- a/bsmd.hisnord/Request.cs
+++ b/bsmd.hisnord/Request.cs
@@ -1619,15 +1619,15 @@ namespace bsmd.hisnord
                                     hn_towa.TowageOnArrival[i] = hn_arrival;
 
                                     if (towa.TowageOnArrivalBeam_MTR.HasValue)
-                                        hn_arrival.TowageOnArrivalBeam_MTR = (decimal)towa.TowageOnArrivalBeam_MTR.Value;
+                                        hn_arrival.TowageOnArrivalBeam_MTR = decimal.Round((decimal)towa.TowageOnArrivalBeam_MTR.Value, 2);
                                     if (towa.TowageOnArrivalDraught_DMT.HasValue)
-                                        hn_arrival.TowageOnArrivalDraught_DMT = (decimal)towa.TowageOnArrivalDraught_DMT.Value;
+                                        hn_arrival.TowageOnArrivalDraught_DMT = decimal.Round((decimal)towa.TowageOnArrivalDraught_DMT.Value, 1);
                                     if(!towa.TowageOnArrivalFlag.IsNullOrEmpty())
                                         hn_arrival.TowageOnArrivalFlag = towa.TowageOnArrivalFlag;
                                     if (towa.TowageOnArrivalGrossTonnage.HasValue)
                                         hn_arrival.TowageOnArrivalGrossTonnage = towa.TowageOnArrivalGrossTonnage.Value.ToString();
                                     if (towa.TowageOnArrivalLengthOverall_MTR.HasValue)
-                                        hn_arrival.TowageOnArrivalLengthOverall_MTR = (decimal)towa.TowageOnArrivalLengthOverall_MTR.Value;
+                                        hn_arrival.TowageOnArrivalLengthOverall_MTR = decimal.Round((decimal)towa.TowageOnArrivalLengthOverall_MTR.Value, 2);
                                     if(!towa.TowageOnArrivalName.IsNullOrEmpty())
                                         hn_arrival.TowageOnArrivalName = towa.TowageOnArrivalName;
 
@@ -1682,9 +1682,9 @@ namespace bsmd.hisnord
 
                                     hn_departure.TowageOnDepartureBeam_MTRSpecified = towd.TowageOnDepartureBeam_MTR.HasValue;
                                     if (hn_departure.TowageOnDepartureBeam_MTRSpecified)
-                                        hn_departure.TowageOnDepartureBeam_MTR = (decimal)towd.TowageOnDepartureBeam_MTR.Value;
+                                        hn_departure.TowageOnDepartureBeam_MTR = decimal.Round((decimal)towd.TowageOnDepartureBeam_MTR.Value, 2);
                                     if (towd.TowageOnDepartureDraught_DMT.HasValue)
-                                        hn_departure.TowageOnDepartureDraught_DMT = (decimal)towd.TowageOnDepartureDraught_DMT.Value;
+                                        hn_departure.TowageOnDepartureDraught_DMT = decimal.Round((decimal)towd.TowageOnDepartureDraught_DMT.Value, 1);
                                     if(!towd.TowageOnDepartureFlag.IsNullOrEmpty())
                                         hn_departure.TowageOnDepartureFlag = towd.TowageOnDepartureFlag;
                                     if(!towd.TowageOnDepartureName.IsNullOrEmpty())
@@ -1709,7 +1709,7 @@ namespace bsmd.hisnord
 
                                     hn_departure.TowageOnDepartureLengthOverall_MTRSpecified = towd.TowageOnDepartureLengthOverall_MTR.HasValue;
                                     if (hn_departure.TowageOnDepartureLengthOverall_MTRSpecified)
-                                        hn_departure.TowageOnDepartureLengthOverall_MTR = (decimal)towd.TowageOnDepartureLengthOverall_MTR.Value;
+                                        hn_departure.TowageOnDepartureLengthOverall_MTR = decimal.Round((decimal)towd.TowageOnDepartureLengthOverall_MTR.Value, 2);
                                     if(!towd.TowageOnDepartureRemarks.IsNullOrEmpty())
                                         hn_departure.TowageOnDepartureRemarks = towd.TowageOnDepartureRemarks;
                                 }
diff --git a/misc/db.sqlite b/misc/db.sqlite
index f9050a71..eb2c3e29 100644
Binary files a/misc/db.sqlite and b/misc/db.sqlite differ
diff --git a/misc/info_deployment.txt b/misc/info_deployment.txt
index 9f3364b7..0da29c62 100644
--- a/misc/info_deployment.txt
+++ b/misc/info_deployment.txt
@@ -6,3 +6,4 @@ auswählen, das am 15.7.22 abläuft. Das Test Zertifikat läuft am 12.11.22 ab.
 Auswahl über "Select from Store.."
 5) komplett neu bauen (clean!)
 6) In Description bei Product name "ENI" statt "ENI Testversion"
+7) Build-Typ auf "Release"