diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItem.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItem.java
index 1d727df08..1b3d13c3e 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItem.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItem.java
@@ -7,7 +7,8 @@ import com.arsdigita.persistence.OID;
 import java.math.BigDecimal;
 
 /**
- *
+ * A possible navigation entry for a public personal profile.
+ * 
  * @author Jens Pelzetter 
  * @version $Id$
  */
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ContentGenerator.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ContentGenerator.java
index 6527fabb2..5b7134f4e 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ContentGenerator.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ContentGenerator.java
@@ -5,12 +5,21 @@ import com.arsdigita.cms.contenttypes.GenericPerson;
 import com.arsdigita.xml.Element;
 
 /**
- *
+ * Implementations of this interface are used to render automatic content
+ * (for example a publication list).
+ * 
  * @author Jens Pelzetter 
  * @version $Id$
  */
 public interface ContentGenerator {
     
+    /**
+     * Generates the content
+     * 
+     * @param parent XML element to attach the content to
+     * @param person The person to be used as data source
+     * @param state The current page state.
+     */
     void generateContent(Element parent, GenericPerson person, PageState state);
     
 }
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
index d887abe3e..653e12218 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
@@ -54,7 +54,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Logger;
 
 /**
- *
+ * Servlet for the PublicPersonalProfile application.
+ * 
  * @author Jens Pelzetter 
  * @version $Id$
  */
@@ -482,6 +483,13 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
         }
     }
 
+    /**
+     * Generates the contact XML for the person
+     * 
+     * @param profileOwnerElem
+     * @param contact
+     * @param state 
+     */
     private void generateContactXml(final Element profileOwnerElem,
                                     final GenericContact contact,
                                     final PageState state) {
@@ -524,6 +532,14 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
         }
     }
 
+    /**
+     * Renders the admin page.
+     * 
+     * @param page
+     * @param request
+     * @param response
+     * @throws ServletException 
+     */
     private void showAdminPage(final Page page,
                                final HttpServletRequest request,
                                final HttpServletResponse response)