diff --git a/ENI2/DetailRootControl.xaml.cs b/ENI2/DetailRootControl.xaml.cs
index 79bb26f0..a44ec20a 100644
--- a/ENI2/DetailRootControl.xaml.cs
+++ b/ENI2/DetailRootControl.xaml.cs
@@ -712,12 +712,7 @@ namespace ENI2
 
             RuleEngine ruleEngine = new RuleEngine();
             foreach (Message aMessage in _messages)
-            {
-                // XXX : TODO wegmachen wenn CREWD/PASD kommt
-                if ((aMessage.MessageNotificationClass == Message.NotificationClass.PASD) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD))
-                    continue;                
-
+            {                
                 if (!aMessage.EvaluateForValidation(this.Core.IsTransit)) continue;
                     
                 List<MessageError> errors = new List<MessageError>();
@@ -777,9 +772,6 @@ namespace ENI2
 
             // Wir können davon ausgehen, dass bei allen Unterelementen die Flags gleich gesetzt sind. Das wird im Import und BorderPoliceDetailControl sichergestellt.                       
 
-            // XXX : TODO auskommentiert bis CREWD/PASD kommt
-            /*
-
             if(crewaMessage.Elements.Count > 0)
             {
                 CREW crewaFirst = crewaMessage.Elements[0] as CREW;
@@ -886,9 +878,7 @@ namespace ENI2
                         }
                     }
                 }
-            }
-
-            */
+            }            
 
             #endregion
 
diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
index 1c06aaa5..ea0ca7e8 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
@@ -49,7 +49,7 @@
                 </ScrollViewer>
             </GroupBox>
         </TabItem>
-        <TabItem Header="{x:Static p:Resources.textCrew}" Name="tabCrewArrival">
+        <TabItem Header="{x:Static p:Resources.textCrewArrival}" Name="tabCrewArrival">
             <GroupBox Name="groupBoxCrewList" Header="{x:Static p:Resources.textTabCrewList}">
                 <Grid>
                     <Grid.RowDefinitions>
@@ -60,13 +60,13 @@
                         <Button Name="buttonImportExcelCrew" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelCrew_Click" />
                         <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumCrewEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/>
                         <Label Name="labelCrewEntryCount" Content="{x:Static p:Resources.textEntries}" />
-                        <!--
+                       
                         <CheckBox Name="checkBoxCrewNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationSchengen_Click"/>
                         <Label Name="labelCrewNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" />
                         <CheckBox Name="checkBoxCrewNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationPAX_Click"/>
                         <Label Name="labelCrewNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" />
                         <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="CREWA" VerticalAlignment="Center" />
-                        -->
+                        
                     </StackPanel>
                     <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" x:Name="dataGridCrewList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
@@ -78,7 +78,7 @@
                             <DataGridTextColumn Header="{x:Static p:Resources.textCrewFunctionOnBoard}" Binding="{Binding CrewMemberDuty, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding CrewMemberNationality, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding CrewMemberPlaceOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
-                            <!--<DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding CrewMemberCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />--> <!-- XXX: TODO -->
+                            <DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding CrewMemberCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding CrewMemberDateOfBirth, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding CrewMemberIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding CrewMemberIdentityDocumentId, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
@@ -91,7 +91,7 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        <!-- XXX : TODO
+        
         <TabItem Header="{x:Static p:Resources.textCrewDeparture}" Name="tabCrewDeparture">
             <GroupBox Name="groupBoxCrewListDeparture" Header="{x:Static p:Resources.textTabCrewList}">
                 <Grid>
@@ -131,7 +131,7 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        --> 
+        
         <TabItem Header="{x:Static p:Resources.textPas}" Name="tabPassengerList">
             <GroupBox Name="groupBoxPassengerList" Header="{x:Static p:Resources.textTabPassengerList}">
                 <Grid>
@@ -143,13 +143,11 @@
                         <Button Name="buttonImportExcelPassenger" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelPassenger_Click" />
                         <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumPasEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/>
                         <Label Name="labelPasEntryCount" Content="{x:Static p:Resources.textEntries}" />
-                        <!--
                         <CheckBox Name="checkBoxPasNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationSchengen_Click"/>
                         <Label Name="labelPasNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" />
                         <CheckBox Name="checkBoxPasNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationPAX_Click"/>
                         <Label Name="labelPasNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" />
-                        <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASA" VerticalAlignment="Center" />
-                        -->
+                        <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASA" VerticalAlignment="Center" />                        
                     </StackPanel>
                     <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPassengerList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
@@ -178,7 +176,7 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        <!-- XXX : TODO 
+         
         <TabItem Header="{x:Static p:Resources.textPasDeparture}" Name="tabPassengerListDeparture">
             <GroupBox Name="groupBoxPassengerListDeparture" Header="{x:Static p:Resources.textTabPassengerList}">
                 <Grid>
@@ -222,7 +220,7 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        -->
+        
     </TabControl>
     
 </src:DetailBaseControl>
diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
index 9f1f7d34..d6d1e34c 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
@@ -112,19 +112,16 @@ namespace ENI2.DetailViewControls
             this.dataGridCrewList.DeleteRequested += DataGridCrewList_DeleteRequested;
             this.dataGridCrewList.CreateRequested += DataGridCrewList_CreateRequested;
             this.dataGridCrewList.RefreshGrid += DataGridCrewList_RefreshGrid;
-            /* XXX : TODO
+            
             if(this._crewMessage.Elements.Count > 0)
             {
                 this.checkBoxCrewNotificationSchengen.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationSchengen;
                 this.checkBoxCrewNotificationPAX.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationPAX;
-            }
-            */
+            }            
 
             #endregion
 
-            #region init CREWD
-
-            /* XXX : TODO
+            #region init CREWD            
 
             if (this._crewdMessage == null)
             {
@@ -146,9 +143,7 @@ namespace ENI2.DetailViewControls
             {
                 this.checkBoxCrewNotificationSchengenDeparture.IsChecked = ((CREWD)this._crewdMessage.Elements[0]).NotificationSchengen;
                 this.checkBoxCrewNotificationPAXDeparture.IsChecked = ((CREWD)this._crewdMessage.Elements[0]).NotificationPAX;
-            }
-
-            */
+            }            
 
             #endregion
 
@@ -168,23 +163,17 @@ namespace ENI2.DetailViewControls
             this.dataGridPassengerList.EditRequested += DataGridPassengerList_EditRequested;
             this.dataGridPassengerList.DeleteRequested += DataGridPassengerList_DeleteRequested;
             this.dataGridPassengerList.CreateRequested += DataGridPassengerList_CreateRequested;
-            this.dataGridPassengerList.RefreshGrid += DataGridPassengerList_RefreshGrid;
-
-            /* XXX : TODO
+            this.dataGridPassengerList.RefreshGrid += DataGridPassengerList_RefreshGrid;            
 
             if (this._pasMessage.Elements.Count > 0)
             {
                 this.checkBoxPasNotificationSchengen.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationSchengen;
                 this.checkBoxPasNotificationPAX.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationPAX;
-            }
-
-            */
+            }            
 
             #endregion
 
-            #region init PASD
-
-            /* XXX : TODO
+            #region init PASD            
 
             if (this._pasdMessage == null)
             {
@@ -206,9 +195,7 @@ namespace ENI2.DetailViewControls
             {
                 this.checkBoxPasNotificationSchengenDeparture.IsChecked = ((PASD)this._pasdMessage.Elements[0]).NotificationSchengen;
                 this.checkBoxPasNotificationPAXDeparture.IsChecked = ((PASD)this._pasdMessage.Elements[0]).NotificationPAX;
-            }
-
-            */
+            }            
 
             #endregion
         }
@@ -437,9 +424,7 @@ namespace ENI2.DetailViewControls
             this.DataGridPassengerList_CreateRequested();
         }
 
-        #endregion
-
-        /*  XXX : TODO
+        #endregion        
 
         #region passenger grid departure
 
@@ -532,8 +517,7 @@ namespace ENI2.DetailViewControls
         }
 
         #endregion
-
-        */
+        
 
         #region crew grid arrival
 
@@ -622,9 +606,7 @@ namespace ENI2.DetailViewControls
             this.DataGridCrewList_CreateRequested();
         }
 
-        #endregion
-
-        /* XXX : TODO
+        #endregion        
 
         #region crew grid departure
 
@@ -716,9 +698,7 @@ namespace ENI2.DetailViewControls
             this.DataGridCrewListDeparture_CreateRequested();
         }
 
-        #endregion
-
-        */
+        #endregion        
 
         #region Excel import
 
@@ -806,9 +786,7 @@ namespace ENI2.DetailViewControls
 
                 stream.Close();
             }
-        }
-
-        /* XXX : TODO
+        }        
 
         private void buttonImportExcelCrewDeparture_Click(object sender, RoutedEventArgs e)
         {
@@ -885,9 +863,7 @@ namespace ENI2.DetailViewControls
 
                 stream.Close();
             }
-        }
-
-        */
+        }        
 
         private void buttonImportExcelPassenger_Click(object sender, RoutedEventArgs e)
         {
@@ -972,7 +948,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        /*
+        
 
         private void buttonImportExcelPassengerDeparture_Click(object sender, RoutedEventArgs e)
         {
@@ -1055,9 +1031,7 @@ namespace ENI2.DetailViewControls
                 }
                 stream.Close();
             }
-        }
-
-        */
+        }       
 
         #endregion
 
@@ -1096,9 +1070,7 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
-        #region Schengen/PAX checkboxes changed event handler
-
-        /* XXX : TODO
+        #region Schengen/PAX checkboxes changed event handler    
 
         private void checkBoxCrewNotificationSchengen_Click(object sender, RoutedEventArgs e)
         {
@@ -1171,9 +1143,7 @@ namespace ENI2.DetailViewControls
                 pasd.NotificationPAX = checkBoxPasNotificationPAXDeparture.IsChecked;
             }
             this.SublistElementChanged(Message.NotificationClass.PASD);
-        }
-
-        */
+        }        
 
         #endregion
 
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 4f241b59..320d9373 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -185,13 +185,7 @@ namespace ENI2.DetailViewControls
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD)
                     pasdMessage = aMessage;
             }
-
-            // XXX : TODO remove this
-
-            this.Messages.Remove(crewdMessage);
-            this.Messages.Remove(pasdMessage);
-
-
+            
             #endregion
 
             #region init ATA
diff --git a/ENI2/EditControls/EditCREWDialog.xaml b/ENI2/EditControls/EditCREWDialog.xaml
index 947cd57b..31a5f275 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml
+++ b/ENI2/EditControls/EditCREWDialog.xaml
@@ -34,7 +34,7 @@
         <Label Name="labelNationality" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textNationality}" />
         <Label Name="labelDateOfBirth" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textDateOfBirth}" />
         <Label Name="labelIdDocType" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textIdDocType}" />
-        <!--<Label Name="labelCountryOfBirth" Grid.Row="4" Grid.Column="1" Content="{x:Static p:Resources.textCountryOfBirth}" Grid.ColumnSpan="2" Margin="263,0,1,0" />--> <!-- XXX : TODO -->
+        <Label Name="labelCountryOfBirth" Grid.Row="4" Grid.Column="1" Content="{x:Static p:Resources.textCountryOfBirth}" Grid.ColumnSpan="2" Margin="263,0,1,0" />
         <Label Name="labelIdDocNumber" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textIdDocNumber}" />
         <Label Name="labelVisaNumber" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textVisaNumber}" />
         <Label Name="labelIssuingState" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textDocumentIssuingState}" />
@@ -53,7 +53,7 @@
             </DatePicker.BlackoutDates>
         </DatePicker>
         <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
-        <!-- <ComboBox Grid.Row="4" Grid.Column="3" Width="auto" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>-->
+        <ComboBox Grid.Row="4" Grid.Column="3" Width="auto" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
         <TextBox Grid.Row="5" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="5" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <ComboBox Grid.Row="6" Grid.Column="3" Width="auto" Name="comboBoxIssuingState" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
diff --git a/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI2/EditControls/EditCREWDialog.xaml.cs
index 3a90a038..7f2735f8 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml.cs
+++ b/ENI2/EditControls/EditCREWDialog.xaml.cs
@@ -67,8 +67,9 @@ namespace ENI2.EditControls
             {                
                 this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
             }
-            // this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO
-            // this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
+
+            this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
+            this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
             // this.textBoxEffects.Text = this.CREW.Effects;
             this.OKClicked += EditCREWDialog_OKClicked;
             this.AddVisible = true;
diff --git a/ENI2/EditControls/EditPasDialog.xaml b/ENI2/EditControls/EditPasDialog.xaml
index cdfa55a4..4f4c0ee1 100644
--- a/ENI2/EditControls/EditPasDialog.xaml
+++ b/ENI2/EditControls/EditPasDialog.xaml
@@ -34,7 +34,7 @@
         <Label Name="labelNationality" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textNationality}" />
         <Label Name="labelDateOfBirth" Grid.Row="2" Grid.Column="2" Content="{x:Static p:Resources.textDateOfBirth}" />
         <Label Name="labelIdDocType" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textIdDocType}" />
-        <!--<Label Name="labelCountryOfBirth" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textCountryOfBirth}" />-->
+        <Label Name="labelCountryOfBirth" Grid.Row="3" Grid.Column="2" Content="{x:Static p:Resources.textCountryOfBirth}" />
         <Label Name="labelIdDocNumber" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textIdDocNumber}" />
         <Label Name="labelVisaNumber" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textVisaNumber}" />
         <Label Name="labelPortOfEmbarkation" Grid.Row="5" Grid.Column="2" Content="{x:Static p:Resources.textPortOfEmbarkation}" />
@@ -42,8 +42,8 @@
         <Label Name="labelTransitPassenger" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textTransitPassenger}" />
         <Label Name="labelIssuingState" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textDocumentIssuingState}" />
         <Label Name="labelExpiryDate" Grid.Row="7" Grid.Column="2" Content="{x:Static p:Resources.textDocumentExpiryDate}" />
-        <!--<Label Name="labelEmergencyCare" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyCare}" />
-        <Label Name="labelEmergencyContactNumber" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyContactNumber}" />-->
+        <Label Name="labelEmergencyCare" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyCare}" />
+        <Label Name="labelEmergencyContactNumber" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textEmergencyContactNumber}" />
 
         <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxLastName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="0" Grid.Column="3" Width="auto" Name="textBoxFirstName" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
@@ -57,7 +57,7 @@
             </DatePicker.BlackoutDates>
         </DatePicker>
         <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True" SelectedValuePath="Key" DisplayMemberPath="Value" StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-        <!--<ComboBox Grid.Row="3" Grid.Column="3" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />-->
+        <ComboBox Grid.Row="3" Grid.Column="3" Name="comboBoxCountryOfBirth" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <TextBox Grid.Row="4" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <enictrl:LocodeControl x:Name="locodePortOfEmbarkation" Grid.Row="5" Grid.Column="3" />
@@ -70,7 +70,7 @@
                 <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
             </DatePicker.BlackoutDates>
         </DatePicker>
-        <!--<TextBox Grid.Row="7" Grid.Column="1" Width="auto" Name="textBoxEmergencyCare" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
-        <TextBox Grid.Row="8" Grid.Column="1" Width="auto" Name="textBoxEmergencyContactNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />-->
+        <TextBox Grid.Row="7" Grid.Column="1" Width="auto" Name="textBoxEmergencyCare" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
+        <TextBox Grid.Row="8" Grid.Column="1" Width="auto" Name="textBoxEmergencyContactNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI2/EditControls/EditPasDialog.xaml.cs
index 25b4dc85..16dc6336 100644
--- a/ENI2/EditControls/EditPasDialog.xaml.cs
+++ b/ENI2/EditControls/EditPasDialog.xaml.cs
@@ -70,12 +70,11 @@ namespace ENI2.EditControls
             {
                 this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
             }
-
-            // XXX : TODO
-            //this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
-            //this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
-            //this.textBoxEmergencyCare.Text = this.PAS.EmergencyCare;
-            //this.textBoxEmergencyContactNumber.Text = this.PAS.EmergencyContactNumber;
+            
+            this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
+            this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
+            this.textBoxEmergencyCare.Text = this.PAS.EmergencyCare;
+            this.textBoxEmergencyContactNumber.Text = this.PAS.EmergencyContactNumber;
 
             this.OKClicked += EditPasDialog_OKClicked;
             this.AddVisible = true;
@@ -98,10 +97,10 @@ namespace ENI2.EditControls
             this.PAS.PassengerInTransit = this.checkBoxTransitPassenger.IsChecked;
             this.PAS.PassengerIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string)this.comboBoxIssuingState.SelectedValue;
             this.PAS.PassengerIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate;
-            // XXX : TODO
-            // this.PAS.PassengerCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
-            //this.PAS.EmergencyCare = this.textBoxEmergencyCare.Text.Trim();
-            //this.PAS.EmergencyContactNumber = this.textBoxEmergencyContactNumber.Text.Trim();
+            
+            this.PAS.PassengerCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
+            this.PAS.EmergencyCare = this.textBoxEmergencyCare.Text.Trim();
+            this.PAS.EmergencyContactNumber = this.textBoxEmergencyContactNumber.Text.Trim();
         }
 
         private void EditPasDialog_OKClicked()
diff --git a/ENI2/EditControls/SelectImportClassesDialog.xaml.cs b/ENI2/EditControls/SelectImportClassesDialog.xaml.cs
index 39e1d021..a513bd93 100644
--- a/ENI2/EditControls/SelectImportClassesDialog.xaml.cs
+++ b/ENI2/EditControls/SelectImportClassesDialog.xaml.cs
@@ -46,9 +46,7 @@ namespace ENI2.EditControls
                     (aMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.ATD) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.STO) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) || // XXX : TODO remove
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.PASD)
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.STO)                    
                     ) continue;
 
                 if (IsTransit &&
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 3fa6e767..12b197b5 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -79,9 +79,9 @@ namespace ENI2.Excel
                         case Message.NotificationClass.CREW:
                             this.WriteCREW(message, true, isRefSheet);
                             break;
-                        //case Message.NotificationClass.CREWD: // XXX-TODO
-                        //    this.WriteCREW(message, false, isRefSheet);
-                        //    break;
+                        case Message.NotificationClass.CREWD:
+                            this.WriteCREW(message, false, isRefSheet);
+                            break;
                         case Message.NotificationClass.HAZA:
                             this.WriteHAZ(message, true);
                         break;
@@ -114,9 +114,9 @@ namespace ENI2.Excel
                         case Message.NotificationClass.PAS:
                             this.WritePAS(message, true, isRefSheet);
                             break;
-                        //case Message.NotificationClass.PASD: // XXX - TODO
-                        //    this.WritePAS(message, false, isRefSheet);
-                        //    break;
+                        case Message.NotificationClass.PASD:
+                            this.WritePAS(message, false, isRefSheet);
+                            break;
                         case Message.NotificationClass.POBA:
                             if (message.Elements[0] is POBA poba) this.WriteMessage(poba);
                             break;
@@ -378,14 +378,12 @@ 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++)
             {
@@ -795,13 +793,12 @@ 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++)
             {
diff --git a/ENI2/Util/UIHelper.cs b/ENI2/Util/UIHelper.cs
index 383881b9..48fc1b0a 100644
--- a/ENI2/Util/UIHelper.cs
+++ b/ENI2/Util/UIHelper.cs
@@ -174,8 +174,8 @@ namespace ENI2.Util
                     case Message.NotificationClass.BPOL:
                     case Message.NotificationClass.CREW:
                     case Message.NotificationClass.PAS:
-                    //case Message.NotificationClass.CREWD: // XXX : TODO
-                    //case Message.NotificationClass.PASD:
+                    case Message.NotificationClass.CREWD:
+                    case Message.NotificationClass.PASD:
                         aMessage.ENINotificationIconString = "../Resources/policeman_german.png";
                         aMessage.ENINotificationDetailGroup = Properties.Resources.textBorderPolice;
                         aMessage.ENINotificationDetailIndex = 10;
diff --git a/SendNSWMessageService/NSWSendService.cs b/SendNSWMessageService/NSWSendService.cs
index 692a0878..d3cbad52 100644
--- a/SendNSWMessageService/NSWSendService.cs
+++ b/SendNSWMessageService/NSWSendService.cs
@@ -144,16 +144,8 @@ namespace SendNSWMessageService
                             if (message.InternalStatus != Message.BSMDStatus.TOSEND) continue;
 
                             // "Virtuelle" Meldeklassen (bisher: DK) werden hier nicht versendet!
-                            if (message.MessageNotificationClass == Message.NotificationClass.STO) continue;
-                                
-                            // muss zum Go Live wieder einkommentiert werden, da CREWD und PASD vorerst nicht versendet werden
-
-                            // XXX : TODO herausnehmen
-                            if((message.MessageNotificationClass == Message.NotificationClass.CREWD) ||
-                                (message.MessageNotificationClass == Message.NotificationClass.PASD))
-                                continue;
-                            
-
+                            if (message.MessageNotificationClass == Message.NotificationClass.STO) continue;                                                           
+                           
                             if ((message.MessageNotificationClass == Message.NotificationClass.VISIT) ||
                                     (message.MessageNotificationClass == Message.NotificationClass.TRANSIT))
                                 continue;
diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index c7f01e9e..707f4a3f 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -48,9 +48,9 @@ namespace bsmd.database
         [ENI2Validation]
         public string CrewMemberPlaceOfBirth { get; set; }
 
-        // [Validation(ValidationCode.FLAG_CODE)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
-        [ENI2Validation] // XXX - TODO
+        [ENI2Validation]
         public string CrewMemberCountryOfBirth { get; set; }
 
         [Validation(ValidationCode.NOT_NULL)]
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index b7e942c1..fc6ce6f8 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -139,9 +139,9 @@ namespace bsmd.database
         [ENI2Validation]
         public bool? NotificationPAX { get; set; }
 
-        //[Validation(ValidationCode.FLAG_CODE)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
-        [ENI2Validation] // XXX - TODO
+        [ENI2Validation]
         public string PassengerCountryOfBirth { get; set; }
 
         [ENI2Validation]