diff --git a/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java
index 423fd9d5a..b38420533 100755
--- a/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig.java
@@ -112,7 +112,7 @@ public final class NavigationConfig extends AbstractConfig {
     /**
      * The maximum number of items In the object list on an index page.
      */
-    private final Parameter m_indexPageMaxItems = new StringParameter(
+    private final Parameter m_indexPageMaxItems = new IntegerParameter(
         "com.arsdigita.navigation.index_page_max_items",
         Parameter.REQUIRED, new Integer(30) );
 
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
index 1e492730c..1fa53d61a 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal-welcome.jsp
@@ -7,8 +7,8 @@
      Currently the same as def-portal.jsp, may change in future to
      support special features of a site's start page (home page)      
  
-    ##Title: A Portal Page usable as Index Page in Navigation
-    ##Descr: Portal Page including navigation menu. Portlets must be added separately.
+    ##Title: A Portal Page including navigation bar
+    ##Descr: Portal Page meant as an alternative site welcome page in navigation. Portlets must be added separately.
     ##Path : /templates/ccm-navigation/navigation/def-portal-welcome.jsp
 -->
 
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
index 59354b12d..9ad4cfb8d 100644
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/def-portal.jsp
@@ -7,8 +7,8 @@
 <!-- JSP template to use a portal page as index page in navigation  
      Currently the same as def-portal-welcome.jsp, may change in future.
  
-    ##Title: A Portal Page usable as Index Page in Navigation
-    ##Descr: A portal page including navigation menu. Portlets must be added separately.
+    ##Title: Portal Page with navigatgion menu
+    ##Descr: A portal page for embedding a portal page as navigation leaves page navigation menu. Portlets must be added separately.
     ##Path : /templates/ccm-navigation/navigation/def-portal.jsp
 -->
 
diff --git a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
index 6824c8c04..b92f0cab8 100755
--- a/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
+++ b/ccm-navigation/web/templates/ccm-navigation/navigation/nav-demo.jsp
@@ -1,9 +1,9 @@
 <!--
    Template to generate a sitemap page
 
-   ##Title: Sitemap Page
-   ##Descr: Same as def-sitemap, for backwards compatibility. To be deleted soon.
-   ##Path : /templates/ccm-navigation/navigation/min-default.jsp
+   ##Title: Navigation Demonstration
+   ##Descr: Purpose unknown. To be deleted soon.
+   ##Path : /templates/ccm-navigation/navigation/nav-demo.jsp
 -->
 <jsp:root 
   xmlns:jsp="http://java.sun.com/JSP/Page"