diff --git a/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml b/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
index b21a7ed06..6ce84f5a1 100755
--- a/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
+++ b/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
+<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" 
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
+
+<!-- NOTE: This file is read only once during load step. Later modification
+           require to dreate (load) the database again (or manually modify the
+           affected database tables).                                        -->
   <ctd:content-type label="FAQ Item"
 		      description="An FAQ item type"
 		       objectType="com.arsdigita.cms.contenttypes.FAQItem"
 		        classname="com.arsdigita.cms.contenttypes.FAQItem">
+      <!--  Overwrite the standard pageCreate class to customize and include 
+            additional content type specific widgets.                       -->
+    <ctd:authoring-kit 
+        createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
 <!--
-    <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
- -->   
     <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
+ -->   
 
       <ctd:authoring-step
                   labelKey="cms.contenttypes.shared.basic_properties.title" 
diff --git a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/FAQItemPropertyForm.java b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/FAQItemPropertyForm.java
index 6be856425..9556daf57 100755
--- a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/FAQItemPropertyForm.java
+++ b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/FAQItemPropertyForm.java
@@ -19,7 +19,7 @@
 package com.arsdigita.cms.contenttypes.ui;
 
 import com.arsdigita.cms.contenttypes.FAQItem;
-import com.arsdigita.cms.contenttypes.util.InlinesiteGlobalizationUtil;
+import com.arsdigita.cms.contenttypes.util.FAQGlobalizationUtil;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.event.FormInitListener;
@@ -85,7 +85,7 @@ public class FAQItemPropertyForm extends BasicPageForm
     protected void addWidgets() {
         super.addWidgets();
 
-        add( new Label(InlinesiteGlobalizationUtil
+        add( new Label(FAQGlobalizationUtil
                        .globalize("cms.contenttypes.ui.faq.question")) );
         ParameterModel questionParam
             = new StringParameter( QUESTION );
@@ -96,7 +96,7 @@ public class FAQItemPropertyForm extends BasicPageForm
         question.setRows( 5 );
         add( question );
 
-        add( new Label(InlinesiteGlobalizationUtil
+        add( new Label(FAQGlobalizationUtil
                        .globalize("cms.contenttypes.ui.faq.answer")) );
         ParameterModel answerParam = new StringParameter( ANSWER );
         answerParam
@@ -106,7 +106,7 @@ public class FAQItemPropertyForm extends BasicPageForm
         answer.setRows( 5 );
         add( answer );
         
-        add( new Label(InlinesiteGlobalizationUtil
+        add( new Label(FAQGlobalizationUtil
                        .globalize("cms.contenttypes.ui.faq.sectionName")) );
         ParameterModel sectionNameParam = new StringParameter( SECTION_NAME );
         TextField sectionName = new TextField(sectionNameParam); 
diff --git a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java
index 7264437df..f2b06eb52 100755
--- a/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java
+++ b/ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java
@@ -18,13 +18,6 @@
  */
 package com.arsdigita.cms.contenttypes.ui.authoring;
 
-import com.arsdigita.cms.contenttypes.FAQItem;
-import com.arsdigita.cms.Folder;
-import com.arsdigita.cms.ContentBundle;
-import com.arsdigita.cms.ContentSection;
-import com.arsdigita.cms.ItemSelectionModel;
-import com.arsdigita.cms.ui.authoring.PageCreate;
-import com.arsdigita.cms.ui.authoring.CreationSelector;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.bebop.event.FormSectionEvent;
@@ -32,11 +25,20 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener;
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.PageState;
-import com.arsdigita.cms.contenttypes.util.InlinesiteGlobalizationUtil;
+import com.arsdigita.cms.ContentBundle;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.cms.contenttypes.FAQItem;
+import com.arsdigita.cms.contenttypes.util.FAQGlobalizationUtil;
+import com.arsdigita.cms.Folder;
+import com.arsdigita.cms.ItemSelectionModel;
+import com.arsdigita.cms.ui.authoring.PageCreate;
+import com.arsdigita.cms.ui.authoring.CreationSelector;
 
 
 /**
- * A page that will create a new FAQItem.
+ * A page that will create a new FAQItem. It overwrites the default PageCreate 
+ * class to to customize the creation screen, and include 2 additional widgets 
+ * (question and answer).
  * 
  * @author Dirk Gomez
  * @see com.arsdigita.intranet.cms.FAQItem
@@ -75,7 +77,7 @@ public class FAQItemCreate extends PageCreate {
         question.setCols(40);
         question.setRows(5);
 
-        add(new Label(InlinesiteGlobalizationUtil
+        add(new Label(FAQGlobalizationUtil
                       .globalize("cms.contenttypes.ui.faq.question")));
         add(question);
 
@@ -84,7 +86,7 @@ public class FAQItemCreate extends PageCreate {
         answer.setCols(40);
         answer.setRows(5);
 
-        add(new Label(InlinesiteGlobalizationUtil
+        add(new Label(FAQGlobalizationUtil
                       .globalize("cms.contenttypes.ui.faq.answer")));
         add(answer);
     }
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypePropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypePropertiesStep.java
index e6e0d7a54..d2ddb8ef0 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypePropertiesStep.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypePropertiesStep.java
@@ -45,10 +45,10 @@ public class GenericContactTypePropertiesStep extends SimpleEditStep {
 
         BasicItemForm addContactTypeSheet = new GenericContactTypeAddForm(itemModel);
         add(ADD_CONTACT_SHEET_NAME,
-                (String) ContenttypesGlobalizationUtil.globalize(
+            (String) ContenttypesGlobalizationUtil.globalize(
                 "cms.contenttypes.ui.person.add_contacttype").localize(),
-                new WorkflowLockedComponentAccess(addContactTypeSheet, itemModel),
-                addContactTypeSheet.getSaveCancelSection().getCancelButton());
+            new WorkflowLockedComponentAccess(addContactTypeSheet, itemModel),
+            addContactTypeSheet.getSaveCancelSection().getCancelButton());
 
         GenericContactTypeTable contacttypesTable = new 
                                 GenericContactTypeTable(itemModel);
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java
index 46322ef19..bf5c67c47 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java
@@ -40,8 +40,8 @@ import org.apache.log4j.Logger;
  * A form which will create a new ContentPage or one of its subclasses.
  * 
  * Used to create a new document / content item. Creates widgets to select the
- * workflow, type of content item, and language. Super class adds additional
- * widgets (title and name/url) to complete the form.
+ * workflow, and language. It displays the type of document as well. Super class
+ * adds additional widgets (title and name/url) to complete the form.
  * 
  * It's a pane which is part of a more complex page, additionally containing
  * folder structure, content items in the folder, permissions, etc.
@@ -104,6 +104,7 @@ public class PageCreate extends BasicPageForm
         /* language selection   */
         add(new Label(GlobalizationUtil.globalize("cms.ui.language.field")));
         add(new LanguageWidget(LANGUAGE));
+
         /* Additional widgets from super type: title and name (url)   */
         super.addWidgets();
     }
diff --git a/ccm-core/src/com/arsdigita/bebop/Label.java b/ccm-core/src/com/arsdigita/bebop/Label.java
index 7f4b60a14..1bd75b9c6 100755
--- a/ccm-core/src/com/arsdigita/bebop/Label.java
+++ b/ccm-core/src/com/arsdigita/bebop/Label.java
@@ -195,7 +195,9 @@ public class Label extends BlockStylable implements Cloneable {
      * Sets new default text for this Label.
      *
      * @param label The new label text; will be used as a key into the current
-     * ResourceBundle if possible, or displayed literally.
+     *              ResourceBundle if possible, or displayed literally.
+     * @deprecated refactor to use
+     *             @see setLabel(GlobalizedMessage) instead!
      */
     public void setLabel(String label) {
         setLabel(label, null);
@@ -210,7 +212,7 @@ public class Label extends BlockStylable implements Cloneable {
      * @param state the page state
      * @pre state == null implies !isLocked()
      * @deprecated refactor to use
-     * @see setLabel(GlobalizedMessage, PageState) instead!
+     *             @see setLabel(GlobalizedMessage, PageState) instead!
      */
     public void setLabel(String label, PageState state) {
         if (label == null || label.length() == 0) {
diff --git a/ccm-core/src/com/arsdigita/bebop/Table.java b/ccm-core/src/com/arsdigita/bebop/Table.java
index ff39ad789..04feec6ba 100755
--- a/ccm-core/src/com/arsdigita/bebop/Table.java
+++ b/ccm-core/src/com/arsdigita/bebop/Table.java
@@ -41,10 +41,10 @@ import javax.servlet.ServletException;
 import org.apache.log4j.Logger;
 
 /**
- *  Displays statically or
- * dynamically generated data in tabular form. The data is retrieved
- * from a <code>TableModel</code>.  <p>
- *
+ * Displays statically or dynamically generated data in tabular form. 
+ * The data is retrieved from a <code>TableModel</code>.  
+ * 
+ * <p>
  * This class is similar to the {@link List} class, but it has two dimensions.
  * The table consists of a {@link TableModelBuilder}, a {@link TableColumnModel},
  * a {@link TableHeader} and a {@link TableCellRenderer} for each column.
@@ -803,13 +803,13 @@ public class Table extends BlockStylable implements BebopConstants {
     }
 
     /**
-     *  An internal class
-     * that creates a table model around a set of data given as a
-     * <code>Object[][]</code>. The table models produced by this
-     * builder use row numbers, converted to strings, as the key for
-     * each column of a row.  */
+     * An internal class that creates a table model around a set of data given
+     * as a <code>Object[][]</code>. The table models produced by this builder
+     * use row numbers, converted to strings, as the key for each column of a 
+     * row.
+     */
     public static class MatrixTableModelBuilder
-            extends AbstractTableModelBuilder {
+                        extends AbstractTableModelBuilder {
 
         private Object[][] m_data;
 
diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java b/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java
index 1aef68e30..a21efb9b0 100755
--- a/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java
+++ b/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java
@@ -34,10 +34,11 @@ import com.arsdigita.util.Assert;
 import com.arsdigita.xml.Element;
 
 /**
- * This class is used by {@link Table} in order to maintain its
- * headers. <code>TableHeader</code> is responsible for setting
- * the control event in order to notify the {@link Table} when one
- * of the column headers is clicked.
+ * This class is used by {@link Table} in order to maintain its headers.
+ * 
+ * <code>TableHeader</code> is responsible for setting the control event 
+ * in order to notify the {@link Table} when one of the column headers 
+ * is clicked.
  *
  * @author David Lutterkort
  * @version $Id: TableHeader.java 1638 2007-09-17 11:48:34Z chrisg23 $