diff --git a/ webgoat/main/build.xml b/ webgoat/main/build.xml
index ffcb6a640..84fc9aed5 100644
--- a/ webgoat/main/build.xml	
+++ b/ webgoat/main/build.xml	
@@ -6,7 +6,7 @@
      set to the current working directory.
 -->
 
-<project name="WebGoatClass-J2EE" default="Build_Lab_Env" basedir=".">
+<project name="WebGoatClass-J2EE" default="Build_Class_Env" basedir=".">
 
 <!-- ===================== Property Definitions =========================== -->
 
@@ -269,7 +269,7 @@
 	</target>
 	
 	<!-- Build J2EE Lab Environment release -->
-	<target name="Build_Lab_Env" depends="clean"
+	<target name="Build_DeveloperLab_Env" depends="clean"
 			description="Builds J2EE Course release">
 
 		<!-- Build the WebGoat WAR with the desired properties file -->
@@ -288,6 +288,25 @@
 		</zip>
 	</target> 	
 	
+	<target name="Build_Class_Env" depends="clean"
+			description="Builds WebGoat Course release">
+
+		<!-- Build the WebGoat WAR with the desired properties file -->
+		<ant dir="${app.home}" inheritAll="false">
+			<target name="WebGoatPropertiesOWASP"/>
+			<target name="BuildWindowsWar"/>
+		</ant>
+
+		<antcall target="DeployWar"> </antcall> 
+
+		<!-- Build the CD image -->
+		<zip destfile="${dist.home}/${ant.project.name}.zip">
+			<zipfileset dir="." prefix="${install.home}"
+				includes="java/, tomcat/, webscarab/, webgoat.bat, webgoat_8080.bat, webscarab.bat"
+				excludes="project/.*, project/.settings/**, project/dist/**, project/owasp_distributions/**, project/bin/**, project/build/**"/>
+		</zip>
+	</target> 	
+
 	<!--Build all release -->
 	<target name="Build_OWASP_Release" depends="clean_all"
 		   description="Creates all binary distributions for OWASP">
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java
index c966af97c..b82b7ef75 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java	
@@ -40,9 +40,6 @@ import org.owasp.webgoat.session.WebSession;
  */
 public class NewLesson extends LessonAdapter
 {
-    private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt(
-    "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0);
-
     /**
      *  Description of the Method
      *
@@ -85,10 +82,4 @@ public class NewLesson extends LessonAdapter
     {
 	return ("How to add a new WebGoat lesson");
     }
-
-
-    public Element getCredits()
-    {
-	return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
-    }
 }
diff --git a/ webgoat/main/project/WebContent/WEB-INF/web.xml b/ webgoat/main/project/WebContent/WEB-INF/web.xml
index 979937b87..70f7cbfd1 100644
--- a/ webgoat/main/project/WebContent/WEB-INF/web.xml	
+++ b/ webgoat/main/project/WebContent/WEB-INF/web.xml	
@@ -177,7 +177,7 @@
     <servlet>
 	 <servlet-name>conf</servlet-name>
 	 <jsp-file>/lessons/ConfManagement/config.jsp</jsp-file>
-    </servlet>		
+    </servlet>
     <!-- Define mappings that are used by the servlet container to
          translate a particular request URI (context-relative) to a
          particular servlet.  The examples below correspond to the
@@ -239,7 +239,7 @@
       <servlet-name>conf</servlet-name>
       <url-pattern>/conf</url-pattern>
     </servlet-mapping>
-    
+
     <!-- Define the default session timeout for your application,
          in minutes.  From a servlet or JSP page, you can modify
          the timeout for a particular session dynamically by using
diff --git a/ webgoat/main/project/WebContent/webgoat.jsp b/ webgoat/main/project/WebContent/webgoat.jsp
index d92ae1521..fa0727467 100644
--- a/ webgoat/main/project/WebContent/webgoat.jsp	
+++ b/ webgoat/main/project/WebContent/webgoat.jsp	
@@ -18,7 +18,7 @@
 		  <p>This program is a demonstration of common web application flaws.  
 		  The exercises are intended to provide hands on experience with application 
 		  penetration testing techniques.  The WebGoat project is lead by Bruce Mayhew. Please send all 
-		  comments to Bruce at <A HREF=mailto:WebGoat@g2-inc.com>WebGoat@G2-Inc.com.</A>.</p>
+		  comments to Bruce at <A HREF=mailto:WebGoat@g2-inc.com>WebGoat@G2-Inc.com</A>.</p>
 		  <div id="team">
 			<table border="0" align="center" class="lessonText">
                 <tr>