diff --git a/Kieker.WebGUI/.classpath b/Kieker.WebGUI/.classpath
index c39d34adf79f91c3cd8f66c8ce1eb90d800db578..658fc2e33f882a2f1b05177d9bb85629cba1e55d 100644
--- a/Kieker.WebGUI/.classpath
+++ b/Kieker.WebGUI/.classpath
@@ -11,6 +11,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
index 7ce2185227c0446a749e7804fc2c3358c80b7cd3..2a540050df5ba48b66d1fba9edd6e4cc49223715 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
@@ -30,8 +30,8 @@ import kieker.common.logging.Log;
 import kieker.common.logging.LogFactory;
 
 /**
- * The class {@link GlobalPropertiesBean} is an application-scoped JSF bean, containing the necessary properties and constants for the application. It reads them
- * from one or more properties-files and resource bundles to allow the simple modification of parameters without a necessary recompiling of the whole
+ * The class {@link GlobalPropertiesBean} is an application-scoped JSF bean, containing properties, constants and partially localized texts for the application. It
+ * reads them from properties files and ressource bundles, making sure that those constants can be modified without a necessary recompiling of the whole
  * application.<br>
  * It is application-scoped as only one instance of this class is necessary.
  * 
@@ -79,7 +79,7 @@ public final class GlobalPropertiesBean {
 		} catch (final IOException ex) {
 			// If this exception occurs there isn't much we can do. This means the resource isn't available. We can't shutdown the whole application, so instead we
 			// log the error.
-			GlobalPropertiesBean.LOG.error("An error occured during the initialization of the propertiess.", ex);
+			GlobalPropertiesBean.LOG.error("An error occured during the initialization of the properties.", ex);
 		}
 	}
 
@@ -184,7 +184,7 @@ public final class GlobalPropertiesBean {
 	}
 
 	/**
-	 * This method delivers the localized message, which can be used if he creation of a repository resulted in an exception.
+	 * This method delivers the localized message, which can be used if the creation of a repository resulted in an exception.
 	 * 
 	 * @return The value of the property.
 	 */
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
index a07118a6463fe9336d160a716d814495ca61d087..e88427d59da032062d08127445cb0461d09e5aa8 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
@@ -27,7 +27,7 @@ import javax.faces.bean.ManagedBean;
 /**
  * The {@link ThemeSwitcherBean} is responsible for holding a list with all application wide available themes (look and feels). As this is a static list, it is not
  * possible to import new themes during the runtime.<br>
- * As the list with the available themes is a static list, this class is an application scoped JSF managed bean.
+ * This class is an application scoped JSF managed bean, as the list with the available themes is a static list.
  * 
  * @author Nils Christian Ehmke
  */
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
index 04fa8a0d5bb649deddc3dad488e62a1394e4672a..6a718e063748028eb2d558a07de3200a5827d013 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
@@ -23,7 +23,7 @@ import javax.faces.bean.SessionScoped;
 import kieker.webgui.beans.application.GlobalPropertiesBean;
 
 /**
- * This bean contains information about the user of this session (like user name and authorization). It provides method to log into the application.<br>
+ * This bean contains information about the user of this session (like user name and authorization). It provides methods to perform a login into the application.<br>
  * This class is a JSF managed bean with session scope. This means also that it is possible to login the same user multiple times.
  * 
  * @author Nils Christian Ehmke
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
index fa600e6282edb873c49958a357f0c1c196ceb7d6..6711a6b3fbf8fc4ca20da9f0e2b5d229391c9451 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
@@ -101,7 +101,7 @@ public final class CurrentCockpitBean {
 	}
 
 	/**
-	 * This method sets the project stored within this bean and returns the new page for the navigation.
+	 * This method sets the project stored within this bean.
 	 * 
 	 * @param newName
 	 *            The name of the project.
@@ -118,6 +118,7 @@ public final class CurrentCockpitBean {
 	 * JSF.</b>
 	 */
 	public void initalize() {
+		// TODO Replace the log messages with the localizes messages
 		synchronized (this) {
 			try {
 				// Make sure that the initialization will only be done for the init request.
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
index fdefb1fcc7333f678a78708d54b8d78771289e38..80451190765f82744385e7575a9d35151a0093b3 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
@@ -31,7 +31,7 @@ import org.primefaces.event.SelectEvent;
 
 /**
  * /**
- * The {@link CurrentControllerBean} contains the necessary data behind an instance of the project overview.<br>
+ * The {@link CurrentProjectOverviewBean} contains the necessary data behind an instance of the project overview.<br>
  * The class is a JSF managed bean with view scope.
  * 
  * @author Nils Christian Ehmke
@@ -50,7 +50,7 @@ public final class CurrentProjectOverviewBean {
 	private String projectName;
 
 	/**
-	 * Default constructor.
+	 * Default constructor. <b>Do not call this constructor manually. It will only be accessed by JSF.</b>
 	 */
 	public CurrentProjectOverviewBean() {
 		// No code necessary
@@ -97,6 +97,7 @@ public final class CurrentProjectOverviewBean {
 	 * Updates the list containing the available projects name.
 	 */
 	public void updateLists() {
+		// TODO This part should be replaced by a ManagedProperty annotation
 		final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
 		final ProjectsBean bean = (ProjectsBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null, "projectsBean");
 
@@ -120,7 +121,7 @@ public final class CurrentProjectOverviewBean {
 	/**
 	 * This method delivers all available projects as a list of string.
 	 * 
-	 * @return All currently available projects. The list is just a copy.
+	 * @return All currently available projects.
 	 */
 	public List<String> getProjects() {
 		return this.projects;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java
index 735ea76cd0f74cc1cd627ff0f5d07389f088f40a..47cd971875bb7194bc18a0008fc3604309a29e20 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java
@@ -22,15 +22,10 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class AnalysisInitializationException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * private static final long serialVersionUID = 1L;
-	 * 
-	 * /**
 	 * Creates a new instance of this class.
 	 */
 	public AnalysisInitializationException() {
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisStateException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisStateException.java
index e9b2aa180eee74040041c3bd0d31cfaf023aeb30..7111860380a8070099f0b8eb9e85177024e15a2e 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisStateException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/AnalysisStateException.java
@@ -22,15 +22,10 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class AnalysisStateException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * private static final long serialVersionUID = 1L;
-	 * 
-	 * /**
 	 * Creates a new instance of this class.
 	 */
 	public AnalysisStateException() {
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/DisplayNotFoundException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/DisplayNotFoundException.java
index 8733d7e2536f4183d9f35d306e37eefbf33eb9e9..a21be52a79af62144795310079d05630511841f7 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/DisplayNotFoundException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/DisplayNotFoundException.java
@@ -22,9 +22,7 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class DisplayNotFoundException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryAlreadyExistingException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryAlreadyExistingException.java
index e00ee053bb0cb1c87ca301c480dd99c55300fd30..19eb1e9bcf6b4cea6f37c03653c5609a8fa66eb8 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryAlreadyExistingException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryAlreadyExistingException.java
@@ -22,9 +22,7 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class LibraryAlreadyExistingException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryLoadException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryLoadException.java
index cc1e81aac269f1892a4d39f6fba3bd6ace4d1e4f..a50d0a241072289a8b1e48659e9e5398e83fc6c1 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryLoadException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/LibraryLoadException.java
@@ -22,9 +22,7 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class LibraryLoadException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/NewerProjectException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/NewerProjectException.java
index 1e01d3f43fc2668b3a93168529d7e8227797d8e5..cd1ac2378e78488ec7bed70f03cd35b0d9298358 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/NewerProjectException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/NewerProjectException.java
@@ -23,9 +23,7 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class NewerProjectException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
index ed759df65f8f7f746be377b9b6f0f1a9d4c3fd79..6e0fbad9848d85c04b89900107d49cf23bf8a978 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
@@ -22,9 +22,7 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class ProjectAlreadyExistingException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java
index c1f7d74ff3bab0024ed25b1e8ea077f174a8b2cd..7e4d2bf20ee2e54e1035f8d1c8543729c357b5de 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java
@@ -16,14 +16,12 @@
 package kieker.webgui.common.exception;
 
 /**
- * This exception ocurs when something goes wrong during the loading/opening of a given project.
+ * This exception occurs when something goes wrong during the loading/opening of a given project.
  * 
  * @author Nils Christian Ehmke
  */
 public final class ProjectLoadException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java
index 7432e277ab5abd391521df9ef4701c0d0bb5823c..1b02f59f95a3ad1d1222365280b79c0c8c983234 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java
@@ -22,9 +22,7 @@ package kieker.webgui.common.exception;
  * @author Nils Christian Ehmke
  */
 public final class ProjectNotExistingException extends AbstractKiekerWebGUIException {
-	/**
-	 * The UID.
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java
index 3f95ce2921134dce506b093d39dc7fd8083807c3..11f677b9a0fea611472ad7b3d62f222ba8130a50 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java
@@ -43,7 +43,7 @@ public final class PluginFinder {
 	}
 
 	/**
-	 * This method delivers all classes which are available in the given jar and are compatible with <code>AbstractRepository</code>).
+	 * This method delivers all classes which are available in the given jar and are compatible with <code>AbstractRepository</code>..
 	 * 
 	 * @param url
 	 *            The url for the jar.