diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java b/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java
index 0f94399fe..2c70201de 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java
@@ -412,6 +412,7 @@ public class HammerHead extends HttpServlet {
      *
      * @param s Description of the Parameter
      * @param screen a {@link org.owasp.webgoat.session.Screen} object.
+     * @param screen a {@link org.owasp.webgoat.session.Screen} object.
      * @param response Description of the Parameter
      * @exception IOException Description of the Exception
      * @throws java.io.IOException if any.
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java b/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java
index b5385f9fd..270dc434e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java
@@ -41,9 +41,7 @@ public class WebGoatServletListener implements ServletContextListener {
 
     private static final Logger logger = LoggerFactory.getLogger(HammerHead.class);
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void contextInitialized(ServletContextEvent sce) {
         ServletContext context = sce.getServletContext();
@@ -80,9 +78,7 @@ public class WebGoatServletListener implements ServletContextListener {
         new PluginsLoader(Paths.get(pluginPath), Paths.get(targetPath)).loadPlugins();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
         ServletContext context = sce.getServletContext();
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 13c0ef809..5598af3b1 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -233,6 +233,8 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
 
     /**
      * <p>getSubmitMethod</p>
+     *
+     * @return a {@link java.lang.String} object.
      */
     public abstract String getSubmitMethod();
 
@@ -647,12 +649,14 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
             .append("/").append(getCategory().getRanking()).toString();
     }
 
-     /**
+    /**
      * Get the link to the target servlet.
      *
      * Unlike getLink() this method does not require rendering the output of
      * the request to the link in order to execute the servlet's method with
      * conventional HTTP query parameters.
+     *
+     * @return a {@link java.lang.String} object.
      */
     public String getServletLink() {
         StringBuffer link = new StringBuffer("attack");
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
index 5452bfe84..2f3bf9d11 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
@@ -110,8 +110,8 @@ public abstract class LessonAdapter extends AbstractLesson {
     }
 
     /**
-     * Initiates lesson restart functionality. Lessons should override this for 
-     * lesson specific actions 
+     * Initiates lesson restart functionality. Lessons should override this for
+     * lesson specific actions
      */
     public void restartLesson() {
         // Do Nothing - called when restart lesson is pressed. Each lesson can do something
@@ -153,6 +153,8 @@ public abstract class LessonAdapter extends AbstractLesson {
 
     /**
      * provide a default submitMethod of lesson does not implement
+     *
+     * @return a {@link java.lang.String} object.
      */
     public String getSubmitMethod() {
         return "GET";
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonServletMapping.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonServletMapping.java
index cace028ef..9cc6737d8 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonServletMapping.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonServletMapping.java
@@ -3,7 +3,8 @@ package org.owasp.webgoat.lessons;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/***************************************************************************************************
+/**
+ *************************************************************************************************
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
  * <p>
@@ -26,8 +27,10 @@ import java.lang.annotation.RetentionPolicy;
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
  * projects.
  * <p>
+ *
  * @author Nanne Baars
- * @created December 12, 2015
+ * @since  December 12, 2015
+ * @version $Id: $Id
  */
 @Retention(RetentionPolicy.RUNTIME)
 public @interface LessonServletMapping {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java
index b72ee620c..97f222fb2 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java
@@ -14,6 +14,7 @@ import org.owasp.webgoat.session.WebSession;
  * <p>Abstract RandomLessonAdapter class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public abstract class RandomLessonAdapter extends LessonAdapter
 {
@@ -30,6 +31,7 @@ public abstract class RandomLessonAdapter extends LessonAdapter
      *
      * @param s a {@link org.owasp.webgoat.session.WebSession} object.
      * @param stage a {@link java.lang.String} object.
+     * @param stage a {@link java.lang.String} object.
      */
     public void setStage(WebSession s, String stage)
     {
@@ -65,6 +67,7 @@ public abstract class RandomLessonAdapter extends LessonAdapter
      *
      * @param s a {@link org.owasp.webgoat.session.WebSession} object.
      * @param stage a {@link java.lang.String} object.
+     * @param stage a {@link java.lang.String} object.
      */
     public void setStageComplete(WebSession s, String stage)
     {
@@ -100,6 +103,7 @@ public abstract class RandomLessonAdapter extends LessonAdapter
      *
      * @param s a {@link org.owasp.webgoat.session.WebSession} object.
      * @param stage a {@link java.lang.String} object.
+     * @param stage a {@link java.lang.String} object.
      * @return a boolean.
      */
     public boolean isStageComplete(WebSession s, String stage)
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
index c2932a453..1053d212e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
@@ -13,6 +13,7 @@ import org.owasp.webgoat.session.WebSession;
  * <p>Abstract SequentialLessonAdapter class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public abstract class SequentialLessonAdapter extends LessonAdapter
 {
@@ -22,6 +23,7 @@ public abstract class SequentialLessonAdapter extends LessonAdapter
      *
      * @param s a {@link org.owasp.webgoat.session.WebSession} object.
      * @param stage a int.
+     * @param stage a int.
      */
     public void setStage(WebSession s, int stage)
     {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/admin/MenuToLessonMapperScreen.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/admin/MenuToLessonMapperScreen.java
index 9ccd0e649..5a5085ef5 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/admin/MenuToLessonMapperScreen.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/admin/MenuToLessonMapperScreen.java
@@ -84,7 +84,7 @@ public class MenuToLessonMapperScreen extends LessonAdapter
     /**
      * <p>getDefaultRanking.</p>
      *
-     * @return a {@link Integer} object.
+     * @return a {@link java.lang.Integer} object.
      */
     protected Integer getDefaultRanking()
     {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java
index ac403c7e5..b7a66beef 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/HttpBasicsModel.java
@@ -33,6 +33,7 @@ package org.owasp.webgoat.lessons.model;
  * use for more complex lessons.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class HttpBasicsModel {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
index 9f3ef5162..a08decbc6 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
@@ -4,6 +4,12 @@ import org.owasp.webgoat.lessons.AbstractLesson;
 import org.owasp.webgoat.lessons.Category;
 import org.owasp.webgoat.session.WebSession;
 
+/**
+ * <p>LessonInfoModel class.</p>
+ *
+ * @author dm
+ * @version $Id: $Id
+ */
 public class LessonInfoModel {
 
     private String lessonTitle;
@@ -13,6 +19,11 @@ public class LessonInfoModel {
     private boolean hasPlan;
     private String submitMethod;
 
+    /**
+     * <p>Constructor for LessonInfoModel.</p>
+     *
+     * @param webSession a {@link org.owasp.webgoat.session.WebSession} object.
+     */
     public LessonInfoModel(WebSession webSession) {
         AbstractLesson lesson = webSession.getCurrentLesson();
         //TODO make these first class citizens of the lesson itself; and stop passing the session all over ... and generally tighten the checks up
@@ -36,26 +47,56 @@ public class LessonInfoModel {
     }
 
     // GETTERS
+    /**
+     * <p>Getter for the field <code>lessonTitle</code>.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
     public String getLessonTitle() {
         return lessonTitle;
     }
 
+    /**
+     * <p>Getter for the field <code>numberHints</code>.</p>
+     *
+     * @return a int.
+     */
     public int getNumberHints() {
         return numberHints;
     }
 
+    /**
+     * <p>isHasSource.</p>
+     *
+     * @return a boolean.
+     */
     public boolean isHasSource() {
         return hasSource;
     }
 
+    /**
+     * <p>isHasSolution.</p>
+     *
+     * @return a boolean.
+     */
     public boolean isHasSolution() {
         return hasSolution;
     }
 
+    /**
+     * <p>isHasPlan.</p>
+     *
+     * @return a boolean.
+     */
     public boolean isHasPlan() {
         return hasPlan;
     }
 
+    /**
+     * <p>Getter for the field <code>submitMethod</code>.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
     public String getSubmitMethod() {
         return submitMethod;
     }
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
index 7cd012d05..7621e6338 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
@@ -22,6 +22,7 @@ import static org.owasp.webgoat.plugins.PluginFileUtils.replaceInFiles;
  * <p>Plugin class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class Plugin {
 
@@ -34,6 +35,11 @@ public class Plugin {
     private List<File> pluginFiles = Lists.newArrayList();
     private File lessonSourceFile;
 
+    /**
+     * <p>findLesson.</p>
+     *
+     * @param classes a {@link java.util.List} object.
+     */
     public void findLesson(List<String> classes) {
         for (String clazzName : classes) {
             findLesson(clazzName);
@@ -56,6 +62,11 @@ public class Plugin {
         }
     }
 
+    /**
+     * <p>loadFiles.</p>
+     *
+     * @param file a {@link java.nio.file.Path} object.
+     */
     public void loadFiles(Path file) {
         if (fileEndsWith(file, ".html") && hasParentDirectoryWithName(file, NAME_LESSON_SOLUTION_DIRECTORY)) {
             solutionLanguageFiles.put(file.getParent().getFileName().toString(), file.toFile());
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
index 4f8497259..1d7b1cf24 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
@@ -17,12 +17,23 @@ import java.util.zip.ZipFile;
 /**
  * Extract the jar file and place them in the system temp directory in the folder webgoat and collect the files
  * and classes.
+ *
+ * @author dm
+ * @version $Id: $Id
  */
 public class PluginExtractor {
 
     private final List<String> classes = Lists.newArrayList();
     private final List<Path> files = new ArrayList<>();
 
+    /**
+     * <p>extractJarFile.</p>
+     *
+     * @param archive a {@link java.io.File} object.
+     * @param targetDirectory a {@link java.io.File} object.
+     * @return a {@link org.owasp.webgoat.plugins.Plugin} object.
+     * @throws java.io.IOException if any.
+     */
     public Plugin extractJarFile(final File archive, final File targetDirectory) throws IOException {
         ZipFile zipFile = new ZipFile(archive);
         Plugin plugin = new Plugin();
@@ -88,11 +99,21 @@ public class PluginExtractor {
         return targetFile;
     }
 
+    /**
+     * <p>Getter for the field <code>classes</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
     public List<String> getClasses() {
         return this.classes;
     }
 
+    /**
+     * <p>Getter for the field <code>files</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
     public List<Path> getFiles() {
         return this.files;
     }
-}
\ No newline at end of file
+}
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
index 1d0ccdbc6..1b9cef313 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
@@ -16,6 +16,7 @@ import java.util.Collection;
  * <p>PluginFileUtils class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class PluginFileUtils {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginLoadingFailure.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginLoadingFailure.java
index c47edf4dd..ec9104791 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginLoadingFailure.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginLoadingFailure.java
@@ -4,6 +4,7 @@ package org.owasp.webgoat.plugins;
  * <p>PluginLoadingFailure class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class PluginLoadingFailure extends RuntimeException {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
index f886ef03a..1d9731bb0 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
@@ -27,6 +27,7 @@ import java.util.concurrent.Executors;
  * <p>PluginsLoader class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class PluginsLoader {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java
index 9a7ab755a..d73f7e274 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java
@@ -55,6 +55,8 @@ public class LabelDebugService extends BaseService {
 
     /**
      * Reload all the plugins
+     *
+     * @return a {@link org.springframework.http.ResponseEntity} object.
      */
     @RequestMapping(value = "/debug/labels.mvc")
     public @ResponseBody
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonInfoService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonInfoService.java
index d23e70254..b334c4720 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonInfoService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonInfoService.java
@@ -16,10 +16,22 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import javax.servlet.http.HttpSession;
 
 @Controller
+/**
+ * <p>LessonInfoService class.</p>
+ *
+ * @author dm
+ * @version $Id: $Id
+ */
 public class LessonInfoService extends BaseService {
 
     private static final Logger logger = LoggerFactory.getLogger(LessonMenuService.class);
 
+    /**
+     * <p>getLessonInfo.</p>
+     *
+     * @param session a {@link javax.servlet.http.HttpSession} object.
+     * @return a {@link org.owasp.webgoat.lessons.model.LessonInfoModel} object.
+     */
     @RequestMapping(value = "/lessoninfo.mvc", produces = "application/json")
     public @ResponseBody
     LessonInfoModel getLessonInfo(HttpSession session) {
@@ -27,6 +39,12 @@ public class LessonInfoService extends BaseService {
         return new LessonInfoModel(webSession);
     }
 
+    /**
+     * <p>handleException.</p>
+     *
+     * @param ex a {@link java.lang.Exception} object.
+     * @return a {@link java.lang.String} object.
+     */
     @ExceptionHandler(Exception.class)
     @ResponseBody
     @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
@@ -34,6 +52,12 @@ public class LessonInfoService extends BaseService {
         return "An error occurred retrieving the LessonInfoModel:" + ex.getMessage();
     }
 
+    /**
+     * <p>getLessonInfoModel.</p>
+     *
+     * @param webSession a {@link org.owasp.webgoat.session.WebSession} object.
+     * @return a {@link org.owasp.webgoat.lessons.model.LessonInfoModel} object.
+     */
     protected LessonInfoModel getLessonInfoModel(WebSession webSession) {
       return new LessonInfoModel(webSession);
     }
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonTitleService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonTitleService.java
index 67508fed5..3c58a0efc 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonTitleService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LessonTitleService.java
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * <p>LessonTitleService class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class LessonTitleService extends BaseService {
 	
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java
index 9d5b7c972..64e8fc50e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/PluginReloadService.java
@@ -56,7 +56,8 @@ public class PluginReloadService extends BaseService {
     /**
      * Reload all the plugins
      *
-     * @param session a {@link HttpSession} object.
+     * @param session a {@link javax.servlet.http.HttpSession} object.
+     * @return a {@link org.springframework.http.ResponseEntity} object.
      */
     @RequestMapping(value = "/reloadplugins.mvc")
     public @ResponseBody
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/servlets/Controller.java b/webgoat-container/src/main/java/org/owasp/webgoat/servlets/Controller.java
index 357003667..9cd7f284e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/servlets/Controller.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/servlets/Controller.java
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
  * for free software projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class Controller extends HttpServlet {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/Authorization.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/Authorization.java
index 8edd15936..36c8c3a67 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/Authorization.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/Authorization.java
@@ -32,6 +32,9 @@ import java.util.Map;
  * projects.
  *
  * * @version $Id: $Id
+ *
+ * @author dm
+ * @version $Id: $Id
  */
 public class Authorization
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
index b3d98dbeb..2e27378d0 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
@@ -322,6 +322,11 @@ public class Course {
         return null;
     }
 
+    /**
+     * <p>loadLessonFromPlugin.</p>
+     *
+     * @param context a {@link javax.servlet.ServletContext} object.
+     */
     public void loadLessonFromPlugin(ServletContext context) {
         logger.debug("Loading plugins into cache");
         String pluginPath = context.getRealPath("plugin_lessons");
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/DatabaseUtilities.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/DatabaseUtilities.java
index 0be0392d7..391baec5c 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/DatabaseUtilities.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/DatabaseUtilities.java
@@ -141,6 +141,14 @@ public class DatabaseUtilities
 	 *            Description of the Parameter
 	 * @param resultsMetaData
 	 *            Description of the Parameter
+	 * @param resultsMetaData
+	 *            Description of the Parameter
+	 * @param resultsMetaData
+	 *            Description of the Parameter
+	 * @param resultsMetaData
+	 *            Description of the Parameter
+	 * @param resultsMetaData
+	 *            Description of the Parameter
 	 * @return Description of the Return Value
 	 * @exception IOException
 	 *                Description of the Exception
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/ECSFactory.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/ECSFactory.java
index 1289b0536..e3f85f263 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/ECSFactory.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/ECSFactory.java
@@ -560,6 +560,12 @@ public class ECSFactory
 	 *            Description of the Parameter
 	 * @param selected
 	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
 	 * @param name
 	 *            Description of the Parameter
 	 * @param options
@@ -568,6 +574,8 @@ public class ECSFactory
 	 *            Description of the Parameter
 	 * @param selected
 	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
 	 * @return Description of the Return Value
 	 */
 	public static Element makeSelect(boolean diffNames, Select select, String name, Vector<Option> options,
@@ -586,6 +594,12 @@ public class ECSFactory
 	 *            Description of the Parameter
 	 * @param selected
 	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
 	 * @param name
 	 *            Description of the Parameter
 	 * @param options
@@ -594,6 +608,8 @@ public class ECSFactory
 	 *            Description of the Parameter
 	 * @param selected
 	 *            Description of the Parameter
+	 * @param selected
+	 *            Description of the Parameter
 	 * @param rowsShowing
 	 *            Description of the Parameter
 	 * @return Description of the Return Value
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java
index 3fa4cac6c..0e199755b 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java
@@ -3,15 +3,27 @@ package org.owasp.webgoat.session;
 import java.io.Serializable;
 
 /**
+ * <p>LabelDebugger class.</p>
+ *
+ * @author dm
+ * @version $Id: $Id
  */
 public class LabelDebugger implements Serializable {
 
     private boolean isEnabled = false;
 
+    /**
+     * <p>isEnabled.</p>
+     *
+     * @return a boolean.
+     */
     public boolean isEnabled() {
         return isEnabled;
     }
 
+    /**
+     * <p>enable.</p>
+     */
     public void enable() {
         this.isEnabled = true;
     }
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/LessonTracker.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/LessonTracker.java
index b1dd45a12..1d4196781 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/LessonTracker.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/LessonTracker.java
@@ -200,6 +200,14 @@ public class LessonTracker
 	 *            Description of the Parameter
 	 * @param screen
 	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
 	 * @param s
 	 *            Description of the Parameter
 	 * @return Description of the Return Value
@@ -335,6 +343,7 @@ public class LessonTracker
 	 * @param s
 	 *            Description of the Parameter
 	 * @param screen a {@link org.owasp.webgoat.session.Screen} object.
+	 * @param screen a {@link org.owasp.webgoat.session.Screen} object.
 	 */
 	public void store(WebSession s, Screen screen)
 	{
@@ -347,6 +356,7 @@ public class LessonTracker
 	 * @param s
 	 *            Description of the Parameter
 	 * @param screen a {@link org.owasp.webgoat.session.Screen} object.
+	 * @param screen a {@link org.owasp.webgoat.session.Screen} object.
 	 * @param user a {@link java.lang.String} object.
 	 */
 	public void store(WebSession s, Screen screen, String user)
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/Parameter.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/Parameter.java
index ab59d66df..51191bdf2 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/Parameter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/Parameter.java
@@ -28,6 +28,7 @@ package org.owasp.webgoat.session;
  * projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class Parameter implements Comparable
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/RandomLessonTracker.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/RandomLessonTracker.java
index 6d124b3dc..20df5902e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/RandomLessonTracker.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/RandomLessonTracker.java
@@ -10,6 +10,7 @@ import java.util.Properties;
  * <p>RandomLessonTracker class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class RandomLessonTracker extends LessonTracker
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/Role.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/Role.java
index 5b6744c70..14ca60ab5 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/Role.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/Role.java
@@ -4,6 +4,7 @@ package org.owasp.webgoat.session;
  * <p>Role class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class Role {
     private String rolename;
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/SequentialLessonTracker.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/SequentialLessonTracker.java
index 5f7dfa761..07006b1b5 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/SequentialLessonTracker.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/SequentialLessonTracker.java
@@ -8,6 +8,7 @@ import java.util.Properties;
  * <p>SequentialLessonTracker class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class SequentialLessonTracker extends LessonTracker
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthenticatedException.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthenticatedException.java
index 82b7ff87c..cab222bb0 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthenticatedException.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthenticatedException.java
@@ -28,6 +28,7 @@ package org.owasp.webgoat.session;
  * projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class UnauthenticatedException extends Exception
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthorizedException.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthorizedException.java
index 99027bc41..5ccde9f57 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthorizedException.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/UnauthorizedException.java
@@ -28,6 +28,7 @@ package org.owasp.webgoat.session;
  * projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class UnauthorizedException extends Exception
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/User.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/User.java
index e74e5824f..a1ccea6d8 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/User.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/User.java
@@ -7,6 +7,7 @@ import java.util.Iterator;
  * <p>User class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class User {
     private String username;
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/UserTracker.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/UserTracker.java
index 56ba141af..554a06397 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/UserTracker.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/UserTracker.java
@@ -172,6 +172,8 @@ public class UserTracker
 	 * @param screen
 	 *            Description of the Parameter
 	 * @return The lessonTracker value
+	 * @param screen
+	 *            Description of the Parameter
 	 * @param s a {@link org.owasp.webgoat.session.WebSession} object.
 	 */
 	public LessonTracker getLessonTracker(WebSession s, Screen screen)
@@ -183,6 +185,7 @@ public class UserTracker
 	 * <p>getLessonTracker.</p>
 	 *
 	 * @param s a {@link org.owasp.webgoat.session.WebSession} object.
+	 * @param screen a {@link org.owasp.webgoat.session.Screen} object.
 	 * @param user a {@link java.lang.String} object.
 	 * @param screen a {@link org.owasp.webgoat.session.Screen} object.
 	 * @return a {@link org.owasp.webgoat.session.LessonTracker} object.
@@ -208,6 +211,8 @@ public class UserTracker
 	 * @param screen
 	 *            Description of the Parameter
 	 * @return The status value
+	 * @param screen
+	 *            Description of the Parameter
 	 * @param s a {@link org.owasp.webgoat.session.WebSession} object.
 	 */
 	public String getStatus(WebSession s, Screen screen)
@@ -267,6 +272,14 @@ public class UserTracker
 	 *            Description of the Parameter
 	 * @param screen
 	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
+	 * @param screen
+	 *            Description of the Parameter
 	 * @param s
 	 *            Description of the Parameter
 	 */
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/ValidationException.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/ValidationException.java
index 05e37557d..ef025153c 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/ValidationException.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/ValidationException.java
@@ -28,6 +28,7 @@ package org.owasp.webgoat.session;
  * projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class ValidationException extends Exception
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
index f38081950..c2f8c97ff 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServlet;
  * <p>WebgoatContext class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class WebgoatContext {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatProperties.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatProperties.java
index af5718163..4ba24d72a 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatProperties.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatProperties.java
@@ -37,6 +37,7 @@ import java.util.Properties;
  * for free software projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class WebgoatProperties extends Properties {
 
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/BeanProvider.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/BeanProvider.java
index 5574e2baa..49629eaf3 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/BeanProvider.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/BeanProvider.java
@@ -34,6 +34,7 @@ import org.springframework.stereotype.Component;
  * free software projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 @Component
 public class BeanProvider implements ApplicationContextAware
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/HtmlEncoder.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/HtmlEncoder.java
index 65d03bfec..31a56a629 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/HtmlEncoder.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/HtmlEncoder.java
@@ -32,6 +32,7 @@ import java.util.Map;
  * projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class HtmlEncoder
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManager.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManager.java
index ed49c0954..a0f42adc9 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManager.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManager.java
@@ -31,6 +31,7 @@ import java.util.Locale;
  * free software projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 public interface LabelManager
 {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManagerImpl.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManagerImpl.java
index 1cb3513d9..f98b1a981 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManagerImpl.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManagerImpl.java
@@ -36,6 +36,7 @@ import java.util.Locale;
  * free software projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 @Component("labelManager")
 public class LabelManagerImpl implements LabelManager, Serializable
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
index dd2fc3baf..674699c01 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
@@ -44,6 +44,7 @@ import java.util.Locale;
  * for free software projects.
  *
  * @version $Id: $Id
+ * @author dm
  */
 @Component
 @Singleton
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/WebGoatI18N.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/WebGoatI18N.java
index 0fb188621..95d31a94c 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/WebGoatI18N.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/WebGoatI18N.java
@@ -11,6 +11,7 @@ import org.owasp.webgoat.session.WebgoatContext;
  * <p>WebGoatI18N class.</p>
  *
  * @version $Id: $Id
+ * @author dm
  */
 public class WebGoatI18N
 {