diff --git a/ccm-cms-types-contact/pdl/com/arsdigita/content-types/Contact.pdl b/ccm-cms-types-contact/pdl/com/arsdigita/content-types/Contact.pdl
index 94a0a7615..973f73dbe 100755
--- a/ccm-cms-types-contact/pdl/com/arsdigita/content-types/Contact.pdl
+++ b/ccm-cms-types-contact/pdl/com/arsdigita/content-types/Contact.pdl
@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Contact.pdl 287 2005-02-22 00:29:02Z sskracic $
+// $Id: Contact.pdl 1689 2007-10-26 11:06:23Z chrisg23 $
 // $DateTime: 2004/08/17 23:15:09 $
 model com.arsdigita.cms.contenttypes;
 
@@ -46,12 +46,12 @@ object type Contact extends ContentPage {
 }
 
 association {
-	    Contact[0..1] associatedContactForItem =
- 	    		  join cms_items.item_id to contact_content_item_map.item_id,
-			  join contact_content_item_map.contact_id to ct_contacts.contact_id;
-	    ContentItem[0..n] associatedContentItemsForContact =
-            		      join ct_contacts.contact_id to contact_content_item_map.contact_id,
-			      join contact_content_item_map.item_id to cms_items.item_id;
+		Contact[0..1] associatedContactForItem =
+                join cms_items.item_id to contact_content_item_map.item_id,
+                join contact_content_item_map.contact_id to ct_contacts.contact_id;
+        ContentItem[0..n] associatedContentItemsForContact =
+                join ct_contacts.contact_id to contact_content_item_map.contact_id,
+                join contact_content_item_map.item_id to cms_items.item_id;
         
 	}
 	
diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java
index 03c41bc3e..be8b83148 100755
--- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java
+++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/Contact.java
@@ -41,7 +41,7 @@ import com.arsdigita.util.Assert;
  * objects.
  * 
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
- * @version $Id: Contact.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: Contact.java 1689 2007-10-26 11:06:23Z chrisg23 $
  */
 public class Contact extends ContentPage {
 
@@ -65,9 +65,9 @@ public class Contact extends ContentPage {
   public static final String CONTACT_ADDRESS = "contactAddress";
   public static final String PHONES = "phones";
 
-    public static final String ITEMS = "associatedContentItemsForContact";
-    
-    private static final Logger s_log = Logger.getLogger(Contact.class);
+	public static final String ITEMS = "associatedContentItemsForContact";
+
+	private static final Logger s_log = Logger.getLogger(Contact.class);
 
   /** data object type for this domain object */
 	public static final String BASE_DATA_OBJECT_TYPE =
diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/AddContactPropertiesStep.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/AddContactPropertiesStep.java
index d7fd982a5..f46c94e57 100644
--- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/AddContactPropertiesStep.java
+++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ui/contact/AddContactPropertiesStep.java
@@ -23,6 +23,9 @@ import com.arsdigita.domain.DomainObject;
 import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 import com.arsdigita.util.Assert;
 
+/** 
+ *
+ */
 public class AddContactPropertiesStep extends ResettableContainer {
 
 	private static final Logger s_log = Logger