diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 272829c98a168fe30809408fb54fba974a022f37..9df0c3ff22aeb08d71db3835bd78c10dd79f2dc5 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Tue Nov 25 12:10:00 CET 2014
+#Tue Dec 16 13:48:45 CET 2014
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/pom.xml b/pom.xml
index aa3233a6d322c89551cb9d37e9fcf316d9566273..d8c744fb21a5e721a2f6c6a3f3fd49a3b796b435 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,6 @@
 		<java.version>1.6</java.version>
 	</properties>
 
-	<issueManagement>
-		<system>GitLab</system>
-		<url>https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/issues/</url>
-	</issueManagement>
-
 	<distributionManagement>
 		<site>
 			<id>teetime.sf.net</id>
@@ -43,6 +38,11 @@
 		</repository>
 	</distributionManagement>
 
+	<issueManagement>
+		<system>GitLab</system>
+		<url>https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/issues/</url>
+	</issueManagement>
+
 	<developers>
 		<developer>
 			<id>chw</id>
@@ -64,7 +64,6 @@
 		<connection>scm:git:https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime.git</connection>
 		<developerConnection>scm:git:ssh://gitlab@build.se.informatik.uni-kiel.de:chw/teetime.git</developerConnection>
 		<url>https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/</url>
-		<tag>teetime-1.0</tag>
 	</scm>
 
 	<ciManagement>
@@ -116,18 +115,12 @@
 
 	<build>
 		<plugins>
-			<!-- Release plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.1</version>
-			</plugin>
+
 			<!-- we want JDK 1.6 source and binary compatibility -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
-
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -176,8 +169,6 @@
 				</executions>
 			</plugin>
 
-
-
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -190,27 +181,11 @@
 				</configuration>
 			</plugin>
 
-			<!-- <plugin> -->
-			<!-- <groupId>org.apache.maven.plugins</groupId> -->
-			<!-- <artifactId>maven-shade-plugin</artifactId> -->
-			<!-- <executions> -->
-			<!-- <execution> -->
-			<!-- <phase>package</phase> -->
-			<!-- <goals> -->
-			<!-- <goal>shade</goal> -->
-			<!-- </goals> -->
-			<!-- </execution> -->
-			<!-- </executions> -->
-			<!-- <configuration> -->
-			<!-- <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> -->
-			<!-- </configuration> -->
-			<!-- </plugin> -->
-
 			<!-- Checkstyle -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.13</version>
+				<version>2.12</version>
 				<executions>
 					<execution>
 						<phase>test</phase>
@@ -218,7 +193,7 @@
 							<goal>check</goal>
 						</goals>
 						<configuration>
-							<configLocation>${project.basedir}/conf/quality-config/cs-conf.xml</configLocation>
+							<configLocation>${basedir}/conf/quality-config/cs-conf.xml</configLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
 							<encoding>UTF-8</encoding>
 							<consoleOutput>true</consoleOutput>
@@ -240,7 +215,7 @@
 					<threshold>Low</threshold>
 					<includeTests>true</includeTests>
 					<failOnError>false</failOnError>
-					<excludeFilterFile>${project.basedir}/conf/quality-config/fb-filter.xml</excludeFilterFile>
+					<excludeFilterFile>${basedir}/conf/quality-config/fb-filter.xml</excludeFilterFile>
 				</configuration>
 				<executions>
 					<execution>
@@ -260,7 +235,7 @@
 
 				<configuration>
 					<rulesets>
-						<ruleset>${project.basedir}/conf/quality-config/pmd-ruleset.xml</ruleset>
+						<ruleset>${basedir}/conf/quality-config/pmd-ruleset.xml</ruleset>
 					</rulesets>
 					<includeTests>true</includeTests>
 					<targetJdk>${java.version}</targetJdk>
@@ -329,6 +304,7 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
+			<!-- Checkstyle -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -341,7 +317,6 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -354,7 +329,6 @@
 					<!-- <show>public</show> -->
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
@@ -395,8 +369,6 @@
 					</plugin>
 				</plugins>
 			</build>
-			<activation>
-			</activation>
 		</profile>
 		<profile>
 			<id>signing</id>
@@ -427,5 +399,4 @@
 		</profile>
 	</profiles>
 
-
 </project>
diff --git a/src/main/java/teetime/framework/TerminateException.java b/src/main/java/teetime/framework/TerminateException.java
new file mode 100644
index 0000000000000000000000000000000000000000..a82b31073fa80b59cc6cc1e7f4962b5f3103990e
--- /dev/null
+++ b/src/main/java/teetime/framework/TerminateException.java
@@ -0,0 +1,12 @@
+package teetime.framework;
+
+public final class TerminateException extends RuntimeException {
+
+	private static final long serialVersionUID = 6841651916837487909L;
+
+	@Override
+	public synchronized Throwable fillInStackTrace() {
+		return this;
+	}
+
+}
diff --git a/target/site/images/code_screenshot.jpg b/target/site/images/code_screenshot.jpg
deleted file mode 100644
index 22faa31f8dd4b3d533321c83e8ac72a5a2a57b5a..0000000000000000000000000000000000000000
Binary files a/target/site/images/code_screenshot.jpg and /dev/null differ