diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
index cf5141ab3f8db634b28387f1bc2ebd60272d4c03..8a133f660d2134f7252490dfec677a45817c23ef 100644
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
+++ b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
@@ -1920,17 +1920,14 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
 		if (rwMetadataDialog.abrunnerFlag == true) {
 			nameFeatString = "abrunner";
 			rwMetadataDialog.abrunnerFlag = false;	
-
 			
 		} else if (rwMetadataDialog.cpeterekFlag == true) {
 			nameFeatString = "cpeterek";
 			rwMetadataDialog.cpeterekFlag = false;	
 
-
 		} else if (rwMetadataDialog.lweimerFlag == true) {
 			nameFeatString = "lweimer";
 			rwMetadataDialog.lweimerFlag  = false;
-
 			
 		} else if (rwMetadataDialog.ttuFlag == true) {
 			nameFeatString = "ttu";
@@ -1948,6 +1945,14 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
 			nameFeatString = "lsergel";
 			rwMetadataDialog.lsergelFlag = false;
 			
+		} else if (rwMetadataDialog.sgorkeFlag == true) {
+			nameFeatString = "sgorke";
+			rwMetadataDialog.sgorkeFlag = false;
+		
+		} else if (rwMetadataDialog.jlorenzenFlag == true) {
+			nameFeatString = "jlorenzen";
+			rwMetadataDialog.jlorenzenFlag = false;
+			
 		
 		/*
 		} else {
@@ -1964,7 +1969,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
 		updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true);
 			
 		String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat);
-		versionValue = "0.0.9a 0.0.1s";
+		versionValue = "0.0.10a 0.0.1s";
 		//versionValue = "0.0.8a 0.0.1s";
 		updateAnnotation(metaDataList.get(0), versionFeat, versionValue, true);	
 	}
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/EditMetadataDialog.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/EditMetadataDialog.java
index 0ada333301574b6e0d798d2532c8980a545fdaa2..5c45fcb2eb4918701b7d792764f530dd7ec3982b 100644
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/EditMetadataDialog.java
+++ b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/EditMetadataDialog.java
@@ -28,16 +28,16 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
 
 	private Color thistle = new Color(216,191,216);
 
-    private String corpuspartArray [] = {"not defined", "famz", "erz", "zeit"};
+    private String corpuspartArray [] = {"undefined", "famz", "erz", "zeit"};
     private JComboBox<String> corpuspartComboBox= new JComboBox<String>(corpuspartArray);
     
-    private String fictionalArray [] = {"not defined", "yes", "no", "unsure"};
+    private String fictionalArray [] = {"undefined", "yes", "no", "unsure"};
     private JComboBox<String> fictionalComboBox = new JComboBox<String>(fictionalArray);
     
-    private String narrativeArray [] = {"not defined", "yes", "no", "unsure"};
+    private String narrativeArray [] = {"undefined", "yes", "no", "unsure"};
     private JComboBox<String> narrativeComboBox = new JComboBox<String>(narrativeArray);
     
-    private String textTypeArray[] = {"unsure", "Erzähltext", "Kommentar", "Anzeige", "Nachrichten", "Rezension", "Reportage", "Biographie", 
+    private String textTypeArray[] = {"undefined", "unsure", "Erzähltext", "Kommentar", "Anzeige", "Nachrichten", "Rezension", "Reportage", "Biographie", 
     		"Reisebericht/Brief"};
     private JComboBox<String> textTypeComboBox = new JComboBox<String>(textTypeArray);
         
@@ -112,6 +112,9 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
                 for (String s : textTypeArray){
                 	if (s.equals(metadataVal.get(i)))
                 		textTypeComboBox.setSelectedItem(s);
+                	else if (s.isEmpty()){
+                		textTypeComboBox.setSelectedItem(0);
+                	}
                 }
         	}
         	else if (label.getText().equals("Narrative")){
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
index a292c422731f0aaf87e790cb502da273923e3e6c..f91150cf473a22b44b8ad092e4e7ccc13e803d2d 100644
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
+++ b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
@@ -25,6 +25,8 @@ public class RwMetadataDialog extends Dialog {
     public boolean ahartmannFlag  = false;
     public boolean lschaeferFlag = false;
     public boolean lsergelFlag = false;
+    public boolean sgorkeFlag = false;
+    public boolean jlorenzenFlag = false;
 
 
 	public RwMetadataDialog(Shell parentShell) {
@@ -54,6 +56,8 @@ public class RwMetadataDialog extends Dialog {
                     		 ahartmannFlag = false;
                     		 lschaeferFlag = false;
                     		 lsergelFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -82,6 +86,8 @@ public class RwMetadataDialog extends Dialog {
                     		 ahartmannFlag = false;
                     		 lschaeferFlag = false;
                     		 lsergelFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -109,6 +115,8 @@ public class RwMetadataDialog extends Dialog {
                     		 ahartmannFlag = false;
                     		 lschaeferFlag = false;
                     		 lsergelFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -137,6 +145,8 @@ public class RwMetadataDialog extends Dialog {
                     		 ahartmannFlag = false;
                     		 lschaeferFlag = false;
                     		 lsergelFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -166,6 +176,8 @@ public class RwMetadataDialog extends Dialog {
                     		 ttuFlag = false;
                     		 lschaeferFlag = false;
                     		 lsergelFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -193,6 +205,8 @@ public class RwMetadataDialog extends Dialog {
                     		 lweimerFlag = false;
                     		 ttuFlag = false;
                     		 lsergelFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -220,6 +234,8 @@ public class RwMetadataDialog extends Dialog {
                     		 cpeterekFlag = false;
                     		 lweimerFlag = false;
                     		 ttuFlag = false;
+                    		 sgorkeFlag = false;
+                    		 jlorenzenFlag = false;
                     		 close();
                     	 }
                     	 else 
@@ -229,6 +245,64 @@ public class RwMetadataDialog extends Dialog {
                      }
              });
              
+             final Button SGORKE = new Button(container, SWT.PUSH);
+             SGORKE.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+             SGORKE.setBackground(new Color (device,153,50,204));
+             SGORKE.setText("sgorke");
+             
+             SGORKE.addSelectionListener(new SelectionAdapter() {
+                     @Override
+                     public void widgetSelected(SelectionEvent e) 
+                     {
+                    	 if (SGORKE.getEnabled() == true)
+                    	 {
+                    		 sgorkeFlag = true;
+                    		 lschaeferFlag = false;
+                    		 abrunnerFlag = false;
+                    		 ahartmannFlag = false;
+                    		 cpeterekFlag = false;
+                    		 lweimerFlag = false;
+                    		 lsergelFlag = false;
+                    		 ttuFlag = false;
+                    		 jlorenzenFlag = false;
+                    		 close();
+                    	 }
+                    	 else 
+                    	 {
+                    		 sgorkeFlag = false;
+                    	 }	 
+                     }
+             });
+             
+             final Button JLORENZEN = new Button(container, SWT.PUSH);
+             JLORENZEN.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+             JLORENZEN.setBackground(new Color (device, 143,188,143));
+             JLORENZEN.setText("jlorenzen");
+             
+             JLORENZEN.addSelectionListener(new SelectionAdapter() {
+                     @Override
+                     public void widgetSelected(SelectionEvent e) 
+                     {
+                    	 if (JLORENZEN.getEnabled() == true)
+                    	 {
+                    		 jlorenzenFlag = true;
+                    		 lschaeferFlag = false;
+                    		 abrunnerFlag = false;
+                    		 ahartmannFlag = false;
+                    		 cpeterekFlag = false;
+                    		 lweimerFlag = false;
+                    		 lsergelFlag = false;
+                    		 ttuFlag = false;
+                    		 sgorkeFlag = false;
+                    		 close();
+                    	 }
+                    	 else 
+                    	 {
+                    		 jlorenzenFlag = false;
+                    	 }	 
+                     }
+             });
+             
              
              return container;
      }
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem_compare_tei_cab.xml b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem_compare_tei_cab.xml
index 69e5e43e9d6554e9137b7737a52c37b7da76d2e8..e0d0902411c0ef53b32c59b67c8e6959f7c52868 100644
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem_compare_tei_cab.xml
+++ b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem_compare_tei_cab.xml
@@ -771,7 +771,7 @@
     </typeDescription>
     <typeDescription>
       <name>de.idsma.rw.preprocessing.OpenNLPSentence</name>
-      <description>OpenNLP sentence detector </description>
+      <description>OpenNLP sentence detector</description>
       <supertypeName>uima.tcas.Annotation</supertypeName>
     </typeDescription>
   <typeDescription>
@@ -825,6 +825,77 @@
           <rangeTypeName>uima.cas.String</rangeTypeName>
         </featureDescription>
       </features>
+  </typeDescription>
+  <typeDescription>
+      <name>uimarwprojekt.types.STWWord</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+      <features>
+        <featureDescription>
+          <name>Lemma</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>Source</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>Penalty</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>Category</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>Marker</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>Frequency</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      </features>
+    </typeDescription>
+  <typeDescription>
+      <name>de.idsma.rw.AutoFrame</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+      <features>
+        <featureDescription>
+          <name>AutoPos</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>AutoFrame</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      <featureDescription>
+          <name>AutoRwType</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      </features>
+    </typeDescription>
+  <typeDescription>
+      <name>de.idsma.rw.preprocessing.riedlmaNamedEntity</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+      <features>
+        <featureDescription>
+          <name>NamedEntityTag</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      </features>
     </typeDescription>
   </types>
 </typeSystemDescription>