diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 97258620..728c9b07 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>14</ApplicationRevision>
-    <ApplicationVersion>7.0.0.14</ApplicationVersion>
+    <ApplicationRevision>15</ApplicationRevision>
+    <ApplicationVersion>7.0.0.15</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index b72ed1b9..b9b74870 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -1183,8 +1183,7 @@ namespace ENI2.Excel
                 if (waste.WasteType == 2308) waste.WasteType = 505;
                 if (waste.WasteType == 2313) waste.WasteType = 506;
                 if (waste.WasteType == 2309) waste.WasteType = 507;
-                if (waste.WasteType == 3000) waste.WasteType = 401;
-                if (waste.WasteType == 2600) waste.WasteType = 506;
+                if (waste.WasteType == 3000) waste.WasteType = 401;                
 
                 // Waste description Spezialfälle für DK                
                 waste.WasteDescription = reader.ReadText(wasteDescription);
@@ -1301,7 +1300,7 @@ namespace ENI2.Excel
 
                     wr.WasteCode = reader.ReadText(wtype); // hier muss immer was stehen, ist ein festes Beschreibungsfeld
                     wr.WasteDescription = reader.ReadText(wDescr);
-                    if(wr.WasteDescription.IsNullOrEmpty())
+                    if(wr.WasteDescription.IsNullOrEmpty() && (wr.WasteCode != null))
                     {
                         if (wr.WasteCode.Equals("999") || wr.WasteCode.Equals("201") || wr.WasteCode.Equals("202") || wr.WasteCode.Equals("203") ||
                             wr.WasteCode.Equals("204") || wr.WasteCode.Equals("510") || wr.WasteCode.Equals("511"))
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 995f0718..b76c559f 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -85,9 +85,9 @@ namespace ENI2.Excel
                         case Message.NotificationClass.CREW:
                             this.WriteCREW(message, true, isRefSheet);
                             break;
-                        case Message.NotificationClass.CREWD:
-                            this.WriteCREW(message, false, isRefSheet);
-                            break;
+                        //case Message.NotificationClass.CREWD: // XXX-TODO
+                        //    this.WriteCREW(message, false, isRefSheet);
+                        //    break;
                         case Message.NotificationClass.HAZA:                            
                             this.WriteHAZ(message, true);
                         break;
@@ -120,9 +120,9 @@ namespace ENI2.Excel
                         case Message.NotificationClass.PAS:
                             this.WritePAS(message, true, isRefSheet);
                             break;
-                        case Message.NotificationClass.PASD:
-                            this.WritePAS(message, false, isRefSheet);
-                            break;
+                        //case Message.NotificationClass.PASD: // XXX - TODO
+                        //    this.WritePAS(message, false, isRefSheet);
+                        //    break;
                         case Message.NotificationClass.POBA:
                             if (message.Elements[0] is POBA poba) this.WriteMessage(poba);
                             break;
@@ -387,11 +387,13 @@ namespace ENI2.Excel
         private void WriteCREW(Message crewMessage, bool isArrival, bool isRefSheet)
         {
 
+            /* XXX - TODO
             if (crewMessage.Elements.Count > 0)
             {
                 WriteBoolean(string.Format("CREW{0}.NotificationSchengen", isArrival ? "" : "D"), ((CREW)crewMessage.Elements[0]).NotificationSchengen);
                 WriteBoolean(string.Format("CREW{0}.NotificationPAX", isArrival ? "" : "D"), ((CREW)crewMessage.Elements[0]).NotificationPAX);
             }
+            */
 
             for(int i = 0; i<Math.Min(crewMessage.NumberOfExcelRows, crewMessage.Elements.Count); i++)
             {
@@ -432,7 +434,7 @@ namespace ENI2.Excel
                 } 
                 else
                 {
-                    if(!crew.CrewMemberIdentityDocumentIssuingState.Equals("XX"))
+                    if(!crew.CrewMemberIdentityDocumentIssuingState.IsNullOrEmpty() && !crew.CrewMemberIdentityDocumentIssuingState.Equals("XX"))                        
                         WriteText(crewIssuingState, crew.CrewMemberIdentityDocumentIssuingState);
                 }
                 if(isRefSheet)
@@ -795,11 +797,13 @@ namespace ENI2.Excel
 
         private void WritePAS(Message pasMessage, bool isArrival, bool isRefSheet)
         {
+            /* XXX - TODO
             if(pasMessage.Elements.Count > 0)
             {
                 WriteBoolean(string.Format("PAS{0}.NotificationSchengen", isArrival ? "" : "D"), ((PAS)pasMessage.Elements[0]).NotificationSchengen);
                 WriteBoolean(string.Format("PAS{0}.NotificationPAX", isArrival ? "" : "D"), ((PAS)pasMessage.Elements[0]).NotificationPAX);
             }
+            */
 
             for(int i = 0; i < Math.Min(pasMessage.NumberOfExcelRows, pasMessage.Elements.Count); i++)
             {
@@ -845,7 +849,7 @@ namespace ENI2.Excel
                 }
                 else
                 {
-                    if(!pas.PassengerIdentityDocumentIssuingState.Equals("XX"))
+                    if(!pas.PassengerIdentityDocumentIssuingState.IsNullOrEmpty() && !pas.PassengerIdentityDocumentIssuingState.Equals("XX"))
                         WriteText(pasIssuing, pas.PassengerIdentityDocumentIssuingState);
                 }
                 if (isRefSheet)
@@ -1292,7 +1296,7 @@ namespace ENI2.Excel
         {
             if(gender.HasValue)
             {
-                if (gender == 0) WriteText(label, "?");
+                if (gender == 0) WriteText(label, "not known");
                 if (gender == 1) WriteText(label, "m");
                 if (gender == 2) WriteText(label, "f");
                 if (gender == 9) WriteText(label, "d");