diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 2a2abc8f..1ff5c4b8 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -78,7 +78,7 @@
                 <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
 
                 <Label Grid.Column="0" Grid.Row="6" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelBSMDStatusInternal" Content="{Binding BSMDStatusInternal, StringFormat={}{0}}" VerticalContentAlignment="Center" FontWeight="Bold" />
-                <Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}"/>
+                <Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}" Background="Red"/>
                 <Button IsEnabled="True" Name="buttonCopy" Grid.Column="2" Grid.Row="6" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
                 <Button IsEnabled="False" Name="buttonSendPDF" Grid.Column="3" Grid.Row="6" Margin="2" Click="buttonSendPDF_Click" Content="{x:Static p:Resources.textCreatePDF}"/>
                 <Button Name="buttonQueryHIS" Grid.Column="4" Grid.Row="6" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 7af38dba..fd0af334 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -62,7 +62,24 @@ namespace ENI2.DetailViewControls
 
         private void buttonAddMissingEntries_Click(object sender, RoutedEventArgs e)
         {
-            this._was.AddMissingWaste();            
+            this._was.AddMissingWaste();
+            if(this._was.Waste.Count < 15)
+            {
+                Waste newWaste = new Waste
+                {
+                    Identifier = DatabaseEntity.GetNewIdentifier(this._was.Waste),
+                    WAS = this._was,
+                    WasteAmountGeneratedTillNextPort_MTQ = 0,
+                    WasteAmountRetained_MTQ = 0,
+                    WasteCapacity_MTQ = 0,
+                    WasteDescription = "",
+                    WasteDisposalAmount_MTQ = 0,
+                    WasteDisposalPort = "ZZUKN",
+                    WasteDisposedAtLastPort_MTQ = 0                    
+                };
+                this._was.Waste.Add(newWaste);
+            }
+
             this.SublistElementChanged(Message.NotificationClass.WAS);
             this.dataGridWaste.Items.Refresh();
         }
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index fbe9d87d..f47cccd5 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>0</ApplicationRevision>
-    <ApplicationVersion>5.1.6.%2a</ApplicationVersion>
+    <ApplicationVersion>5.1.7.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 473b6e4e..3bf0251b 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/BKRA.cs b/nsw/Source/bsmd.database/BKRA.cs
index 3d3b1357..1bb0aa38 100644
--- a/nsw/Source/bsmd.database/BKRA.cs
+++ b/nsw/Source/bsmd.database/BKRA.cs
@@ -70,7 +70,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.Parameters.AddWithValue(@"ID", this.Id);
+                scmd.Parameters.AddWithValue("ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET BunkerFuelType = @P2, BunkerFuelQuantity_TNE = @P3, Identifier = @P4 WHERE Id = @ID", this.Tablename);
             }
         }
@@ -116,5 +116,17 @@ namespace bsmd.database
 
         #endregion
 
+        #region Validation
+
+        public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
+        {
+            if(this.BunkerFuelQuantity_TNE.HasValue && this.BunkerFuelQuantity_TNE > 10000)
+            {
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Bunker quantity too high?", null, this.Title, this.Identifier, "BKRA"));
+            }
+        }
+
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/BPOL.cs b/nsw/Source/bsmd.database/BPOL.cs
index fba48d54..4d70b5a7 100644
--- a/nsw/Source/bsmd.database/BPOL.cs
+++ b/nsw/Source/bsmd.database/BPOL.cs
@@ -60,7 +60,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.Parameters.AddWithValue(@"ID", this.Id);
+                scmd.Parameters.AddWithValue("ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET StowawaysOnBoard = @P2, CruiseShip = @P3 WHERE Id = @ID", this.Tablename);
             }
         }
diff --git a/nsw/Source/bsmd.database/BRKD.cs b/nsw/Source/bsmd.database/BRKD.cs
index adefe0d2..54d95d43 100644
--- a/nsw/Source/bsmd.database/BRKD.cs
+++ b/nsw/Source/bsmd.database/BRKD.cs
@@ -70,7 +70,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.Parameters.AddWithValue(@"ID", this.Id);
+                scmd.Parameters.AddWithValue("ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET BunkerFuelType = @P2, BunkerFuelQuantity_TNE = @P3, Identifier = @P4 WHERE Id = @ID", this.Tablename);
             }
         }
@@ -114,5 +114,17 @@ namespace bsmd.database
 
         #endregion
 
+        #region Validation
+
+        public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
+        {
+            if (this.BunkerFuelQuantity_TNE.HasValue && this.BunkerFuelQuantity_TNE > 10000)
+            {
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Bunker quantity too high?", null, this.Title, this.Identifier, "BKRD"));
+            }
+        }
+
+        #endregion
+
     }
 }
diff --git a/nsw/Source/bsmd.database/HAZ.cs b/nsw/Source/bsmd.database/HAZ.cs
index bbfce00c..5af2d278 100644
--- a/nsw/Source/bsmd.database/HAZ.cs
+++ b/nsw/Source/bsmd.database/HAZ.cs
@@ -23,7 +23,6 @@ namespace bsmd.database
         private ObservableCollection<DatabaseEntity> igcPositions = new ObservableCollection<DatabaseEntity>();
         private ObservableCollection<DatabaseEntity> imsbcPositions = new ObservableCollection<DatabaseEntity>();
         private ObservableCollection<DatabaseEntity> marpolPositions = new ObservableCollection<DatabaseEntity>();
-        private bool _isDeparture;
 
         #endregion
 
@@ -85,10 +84,7 @@ namespace bsmd.database
 
         // selektor HAZA / HAZD
         [ENI2Validation]
-        public bool IsDeparture {
-            get { return this._isDeparture; }
-            set { this._isDeparture = value; }        
-        }
+        public bool IsDeparture { get; set; }
 
         /// <summary>
         /// No NSW field! Set to determine whether HAZ info should be reported to the NSW
@@ -122,7 +118,7 @@ namespace bsmd.database
         {
             get
             {
-                if (this._isDeparture)
+                if (this.IsDeparture)
                     return "[dbo].[HAZD]";
                 else
                     return "[dbo].[HAZA]";
diff --git a/nsw/Source/bsmd.database/IBCPosition.cs b/nsw/Source/bsmd.database/IBCPosition.cs
index 60fdfa37..2792f4f3 100644
--- a/nsw/Source/bsmd.database/IBCPosition.cs
+++ b/nsw/Source/bsmd.database/IBCPosition.cs
@@ -57,6 +57,7 @@ namespace bsmd.database
         #region Properties
 
         public HAZ HAZ { get; set; }
+
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
         [MaxLength(255)]
@@ -74,7 +75,7 @@ namespace bsmd.database
         {
             get
             {
-                if (this.PollutionCategory.HasValue && (this.PollutionCategory.Value >= 0) && (this.PollutionCategory.Value < pollutionCategories.Length))
+                if (this.PollutionCategory.HasValue && (this.PollutionCategory.Value < pollutionCategories.Length))
                     return pollutionCategories[this.PollutionCategory.Value];
                 return "";
             }
@@ -89,7 +90,7 @@ namespace bsmd.database
         {
             get
             {
-                if (this.Hazards.HasValue && (this.Hazards.Value >= 0) && (this.Hazards.Value < hazards.Length))
+                if (this.Hazards.HasValue && (this.Hazards.Value < hazards.Length))
                     return hazards[this.Hazards.Value];
                 return "";
             }
@@ -105,7 +106,7 @@ namespace bsmd.database
         {
             get
             {
-                if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value >= 0) && (this.FlashpointInformation.Value < flashpointInformations.Length))
+                if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value < flashpointInformations.Length))
                     return flashpointInformations[this.FlashpointInformation.Value];
                 return "";
             }
@@ -186,7 +187,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.Parameters.AddWithValue(@"ID", this.Id);
+                scmd.Parameters.AddWithValue("@ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET ProductName = @P2, PollutionCategory = @P3, Hazards = @P4, " +
                     "FlashpointInformation = @P5, Flashpoint_CEL = @P6, Quantity_KGM = @P7, StowagePosition = @P8, " +
                     "PortOfLoading = @P9, PortOfDischarge = @P10, SpecRef15_19 = @P11, Remarks = @P12, Identifier = @P13 " +
@@ -257,7 +258,7 @@ namespace bsmd.database
 
             if(!this.Flashpoint_CEL.IsNullOrEmpty())
             {
-                string pattern = @"^[<>]?\-?[0-9]+(\.[0-9]+)?$";
+                const string pattern = @"^[<>]?\-?[0-9]+(\.[0-9]+)?$";
                 Regex regex = new Regex(pattern);
 
                 if(!regex.IsMatch(this.Flashpoint_CEL))
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 97eefe1c..ad5850a8 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.1.6")]
+[assembly: AssemblyInformationalVersion("5.1.7")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2019 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 56e9bcbe..dd20984f 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.1.6.*")]
+[assembly: AssemblyVersion("5.1.7.*")]
 
diff --git a/nsw/Source/bsmd.database/STAT.cs b/nsw/Source/bsmd.database/STAT.cs
index 805316aa..b6575f57 100644
--- a/nsw/Source/bsmd.database/STAT.cs
+++ b/nsw/Source/bsmd.database/STAT.cs
@@ -304,7 +304,7 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
-            if ((this.GrossTonnage.HasValue && (this.GrossTonnage.Value >= 500)) && (this.ISMCompanyName.IsNullOrEmpty() || this.ISMCompanyId.IsNullOrEmpty()))
+            if (this.GrossTonnage.HasValue && (this.GrossTonnage.Value >= 500) && (this.ISMCompanyName.IsNullOrEmpty() || this.ISMCompanyId.IsNullOrEmpty()))
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.V821, "ISMCompanyId/Name must be provided", null, this.Title, null, this.Tablename));
         }
 
diff --git a/nsw/Source/bsmd.database/TIEFA.cs b/nsw/Source/bsmd.database/TIEFA.cs
index d6f828e6..d3918c47 100644
--- a/nsw/Source/bsmd.database/TIEFA.cs
+++ b/nsw/Source/bsmd.database/TIEFA.cs
@@ -58,7 +58,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.Parameters.AddWithValue(@"ID", this.Id);
+                scmd.Parameters.AddWithValue("@ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET DraughtUponArrival_DMT = @P2 WHERE Id = @ID", this.Tablename);
             }
         }
diff --git a/nsw/Source/bsmd.database/TIEFD.cs b/nsw/Source/bsmd.database/TIEFD.cs
index f22eebca..c4448b4f 100644
--- a/nsw/Source/bsmd.database/TIEFD.cs
+++ b/nsw/Source/bsmd.database/TIEFD.cs
@@ -59,7 +59,7 @@ namespace bsmd.database
             }
             else
             {
-                scmd.Parameters.AddWithValue(@"ID", this.Id);
+                scmd.Parameters.AddWithValue("@ID", this.Id);
                 scmd.CommandText = string.Format("UPDATE {0} SET DraughtUponDeparture_DMT = @P2 WHERE Id = @ID", this.Tablename);
             }
         }