diff --git a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
index ddde1b476..d0be6db27 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
@@ -95,7 +95,7 @@ com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl x
 
 ; =============================================================================================
 ; devel specific configurations
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/handbook?user\=ccm&password\=ccm
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
 waf.runtime.jdbc_pool_size=80
 
 waf.web.server=localhost\:8080
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java
index dec7b485a..0b0a15964 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java
@@ -39,6 +39,11 @@ public class Initializer extends CompoundInitializer {
         (Initializer.class.getName());
 
 
+    /**
+     * Package Implementation of  {@link Initializer#init(DomainInitEvent)}. 
+     * 
+     * @param evt
+     */
     public void init(DomainInitEvent evt) {
         super.init(evt);
 
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
index 8e04d5c01..c9899d2d9 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -65,6 +65,9 @@ public class Loader extends PackageLoader {
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
+    // Name of files containing an initial category tree(s).
+    // Files are stored as part of the jar, so classloader can find them.
+    // ToDo: relocate files user accessible outside the jar.
     private static final String[] categoryFiles = new String[] {
         "WEB-INF/aplaws/gen-nav-domain-1.00.xml"
       , "WEB-INF/aplaws/gen-nav-hierarchy-1.00.xml"
@@ -89,6 +92,7 @@ public class Loader extends PackageLoader {
             "com.arsdigita.aplaws.navigation_domain",
             Parameter.REQUIRED,
             "GEN-NAV");
+        // Registers to the context by adding the parameter to a map of parameters
         register(m_navigationDomain);
 
         /*
@@ -129,6 +133,7 @@ public class Loader extends PackageLoader {
         String[] files = categoryFiles;
 
         final Parser parser = new Parser();
+        // for each filename in the array of files containing categories
         for (int i = 0 ; i < files.length ; i++) {
             final String file = files[i];
             if (s_log.isInfoEnabled()) {
@@ -177,7 +182,7 @@ public class Loader extends PackageLoader {
               .retrieveApplicationForPath("/portal/");
         portal.setDefaultLayout(PageLayout
               .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));
-    }
+    }   // run method
 
 //  public void registerServicesTemplate(String appURL) {
 //      Application app = Application.retrieveApplicationForPath(appURL);
diff --git a/ccm-gen-aplaws/web/packages/content-section/www/admin/load-cat.jsp b/ccm-gen-aplaws/web/packages/content-section/www/admin/load-cat.jsp
index feedab355..6e555992d 100755
--- a/ccm-gen-aplaws/web/packages/content-section/www/admin/load-cat.jsp
+++ b/ccm-gen-aplaws/web/packages/content-section/www/admin/load-cat.jsp
@@ -1,12 +1,22 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-          xmlns:define="/WEB-INF/bebop-define.tld" 
-          xmlns:show="/WEB-INF/bebop-show.tld"
-    version="1.2">
+<jsp:root   xmlns:jsp="http://java.sun.com/JSP/Page"
+         xmlns:define="/WEB-INF/bebop-define.tld"
+           xmlns:show="/WEB-INF/bebop-show.tld"
+              version="1.2">
 
-  <define:page name="childCategories" pageClass="com.arsdigita.cms.ui.authoring.EmptyPage" title="childCategories" cache="true">
+  <define:page name="childCategories"
+          pageClass="com.arsdigita.cms.ui.authoring.EmptyPage"
+              title="childCategories"
+              cache="true">
 
+    <!-- Class had been moved from ccm-ldn-aplaws to ccm-ldn-terms in
+         order to avoid dependencies between modules, ccm-forum-categorised
+         and a specific kind of the integration module ccm-???-aplaws.
     <define:component name="catSubtree"
       classname="com.arsdigita.aplaws.ui.CategorySubtree"/>
+    -->
+
+    <define:component name="catSubtree"
+      classname="com.arsdigita.london.terms.ui.CategorySubtree"/>
   </define:page>
 
   <show:all/>