diff --git a/ccm-core/src/com/arsdigita/portal/PortletType.java b/ccm-core/src/com/arsdigita/portal/PortletType.java
index 830174ad6..ee5cc6029 100755
--- a/ccm-core/src/com/arsdigita/portal/PortletType.java
+++ b/ccm-core/src/com/arsdigita/portal/PortletType.java
@@ -58,7 +58,7 @@ public class PortletType extends ResourceType {
      * PortletType uses the data object type of ApplicationType.
      */
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.portal.PortletType";
+                               "com.arsdigita.portal.PortletType";
 
     public static final String WIDE_PROFILE = "wide";
     public static final String NARROW_PROFILE = "narrow";
@@ -94,6 +94,7 @@ public class PortletType extends ResourceType {
 
         PackageType packageType = null;
 
+        // is com.arsdigita.portal.Portal initialized
         try {
             packageType = PackageType.findByKey("portal");
         } catch (DataObjectNotFoundException nfe) {
@@ -113,6 +114,7 @@ public class PortletType extends ResourceType {
         setEmbeddedView(true);
     }
 
+    @Override
     protected String getBaseDataObjectType() {
         return BASE_DATA_OBJECT_TYPE;
     }
@@ -358,6 +360,7 @@ public class PortletType extends ResourceType {
             return m_path;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof XSLEntry)) {
                 return false;
diff --git a/ccm-core/src/com/arsdigita/portal/apportlet/AppPortletSetup.java b/ccm-core/src/com/arsdigita/portal/apportlet/AppPortletSetup.java
index cf3bbb5fb..c9e84b3c4 100755
--- a/ccm-core/src/com/arsdigita/portal/apportlet/AppPortletSetup.java
+++ b/ccm-core/src/com/arsdigita/portal/apportlet/AppPortletSetup.java
@@ -27,6 +27,20 @@ import java.util.List;
 import java.util.Iterator;
 
 /**
+ * <p>This class is a convenience class for easily initializing an
+ * Application Portlet type (ie full screen portlet) wrapping
+ * {@link PortletType} class.</p>
+ * <p>
+ * The usage pattern for this class is:
+ * <ul>
+ * <li> Create a PortletSetup class.</li>
+ * <li> Use setters to initialize values.</li>
+ * <li> Call the run method ( setup.run() ).</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Necessary values that are uninitialized when run() is called throw an
+ * exception. </p>
  *
  * @author <a href="mailto:jparsons@arsdigita.com">Jim Parsons</a>
  */
@@ -36,19 +50,38 @@ public class AppPortletSetup extends PortletSetup {
     protected boolean m_isSingleton = false;
 
 
+    /**
+     * Main Constructor, param category is an appender class and used to be able
+     * to appand messages into the log file.
+     * @param category
+     */
     public AppPortletSetup(Category category) {
         super(category);
 
     }
 
+    /**
+     * Determine whether it is a PortalApplication.
+     * Parameter is deprecated and not used for new, legacy free application
+     * types! Should be ommitted in this case.
+     * @param isPortalApplication
+     */
     public void setPortalApplication(boolean isPortalApplication) {
         m_isPortalApplication = isPortalApplication;
     }
 
+    /**
+     * Determine whether it is a singelton application, ie only one instantiation
+     * is apllowed.
+     * Parameter is deprecated and not used for new, legacy free application
+     * types! Should be ommitted in this case.
+     * @param isPortalApplication
+     */
     public void setSingleton(boolean isSingleton) {
         m_isSingleton = isSingleton;
     }
 
+    @Override
     public PortletType run() {
         notice("Validating setup...");
 
diff --git a/ccm-core/web/__ccm__/apps/admin/xsl/index.xsl b/ccm-core/web/__ccm__/apps/admin/xsl/index.xsl
deleted file mode 100755
index f22d44b69..000000000
--- a/ccm-core/web/__ccm__/apps/admin/xsl/index.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0">
-  
-  <xsl:import href="../../../../packages/acs-admin/xsl/admin_en.xsl"/> 
-  
-</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl
index f22d44b69..6bedacb12 100644
--- a/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl
+++ b/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0">
   
-  <xsl:import href="../../../../packages/acs-admin/xsl/admin_en.xsl"/> 
+  <xsl:import href="../../../packages/acs-admin/xsl/admin_en.xsl"/> 
   
 </xsl:stylesheet>