diff --git a/Changes b/Changes
index 2747707..1a233bd 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@
         - Spans now always wrap terms (diewald)
 	- Cosmas-II "und", "oder", and "nicht" operations
 	  now serialize to unordered sequences (diewald)
+	- Cleanup POM (diewald)
 
 0.21 2015-10-27
         - Improved meta query builder (hanl)
diff --git a/pom.xml b/pom.xml
index 76d29f5..2516d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <!-- <parent> <groupId>KorAP-modules</groupId> <artifactId>KorAP-core-modules</artifactId> 
-       <version>1.1</version> </parent> -->
 
   <groupId>de.ids_mannheim.korap</groupId>
   <artifactId>Koral</artifactId>
@@ -10,6 +8,36 @@
   <packaging>jar</packaging>
   <name>Koral</name>
   <url>http://maven.apache.org</url>
+
+  <organization>
+    <name>IDS Mannheim</name>
+    <url>http://www.ids-mannheim.de/</url>
+  </organization>
+
+  <developers>
+    <developer>
+      <name>Joachim Bingel</name>
+      <email>bingel@ids-mannheim.de</email>
+    </developer>
+    <developer>
+      <name>Nils Diewald</name>
+      <email>diewald@ids-mannheim.de</email>
+      <url>http://nils-diewald.de</url>
+    </developer>
+    <developer>
+      <name>Michael Hanl</name>
+      <email>hanl@ids-mannheim.de</email>
+    </developer>
+    <developer>
+      <name>Eliza Margaretha</name>
+      <email>margaretha@ids-mannheim.de</email>
+    </developer>
+  </developers>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <repositories>
     <repository>
       <id>id-maven-repo</id>
@@ -94,16 +122,16 @@
     <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
     <outputDirectory>${basedir}/target/classes</outputDirectory>
     <plugins>
-     <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <compilerVersion>1.7</compilerVersion>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <compilerVersion>1.7</compilerVersion>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
       <!--
 	  Formatter plugin for Eclipse based coding conventions
 	  http://maven-java-formatter-plugin.googlecode.com/svn/site/0.4/usage.html
@@ -204,7 +232,6 @@
 	  <outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/cosmas</outputDirectory>
 	  <libDirectory>${basedir}/src/main/antlr</libDirectory>
 	</configuration>
-	
 	<executions>
 	  <execution>
 	    <goals>