diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractSerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractSerializer.java
index 72e3f54f5..227b44740 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractSerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractSerializer.java
@@ -6,6 +6,8 @@
 package com.mysema.query.codegen;
 
 /**
+ * AbstractSerializer is abstract base class for Serializer implementations
+ * 
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractTypeModel.java b/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractTypeModel.java
index 812e349d4..7fdd4a018 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractTypeModel.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/AbstractTypeModel.java
@@ -6,6 +6,8 @@
 package com.mysema.query.codegen;
 
 /**
+ * AbstractTypeModel is an abstract base class for TypeModel implementations
+ * 
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/DTOSerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/DTOSerializer.java
index 626c4b452..0a8b48d2a 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/DTOSerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/DTOSerializer.java
@@ -10,6 +10,12 @@ import java.io.Writer;
 
 import net.jcip.annotations.Immutable;
 
+/**
+ * DTOSerializer is a Serializer implementation for DTO types
+ * 
+ * @author tiwe
+ *
+ */
 @Immutable
 public class DTOSerializer extends AbstractSerializer{
     
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java
index afa68b4a1..720fb30f6 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java
@@ -8,6 +8,12 @@ package com.mysema.query.codegen;
 import java.io.IOException;
 
 
+/**
+ * EmbeddableSerializer is a Serializer implementation for embeddable types
+ * 
+ * @author tiwe
+ *
+ */
 public class EmbeddableSerializer extends EntitySerializer{
     
     @Override
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
index 0e4b9f45f..ce3697ff8 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java
@@ -12,6 +12,12 @@ import java.util.List;
 
 import net.jcip.annotations.Immutable;
 
+/**
+ * EntitySerializer is a Serializer implementation for entity types
+ * 
+ * @author tiwe
+ *
+ */
 @Immutable
 public class EntitySerializer extends AbstractSerializer{
     
@@ -84,17 +90,6 @@ public class EntitySerializer extends AbstractSerializer{
         
     }
         
-    protected boolean hasOwnEntityProperties(EntityModel model){
-        if (model.hasEntityFields()){
-            for (PropertyModel property : model.getProperties()){
-                if (!property.isInherited() && property.getType().getCategory() == TypeCategory.ENTITY){
-                    return true;
-                }
-            }    
-        }        
-        return false;
-    }
-    
     protected void constructorsForVariables(StringBuilder builder, EntityModel model) {
         String simpleName = model.getSimpleName();
         String queryType = getQueryType(model, model, true);
@@ -119,8 +114,7 @@ public class EntitySerializer extends AbstractSerializer{
         builder.append(");\n");
         builder.append("    }\n\n");        
     }
-
-
+    
     protected void entityField(PropertyModel field, Writer writer) throws IOException {
         String queryType = getQueryType(field.getType(), field.getEntityModel(), false);
         
@@ -132,6 +126,18 @@ public class EntitySerializer extends AbstractSerializer{
         writer.append(builder.toString());
     }
 
+
+    protected boolean hasOwnEntityProperties(EntityModel model){
+        if (model.hasEntityFields()){
+            for (PropertyModel property : model.getProperties()){
+                if (!property.isInherited() && property.getType().getCategory() == TypeCategory.ENTITY){
+                    return true;
+                }
+            }    
+        }        
+        return false;
+    }
+
     protected void initEntityFields(StringBuilder builder, EntityModel model) {
         EntityModel superModel = model.getSuperModel();
         if (superModel != null && superModel.hasEntityFields()){
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/Serializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/Serializer.java
index ef9f62b8c..29e4d85ae 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/Serializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/Serializer.java
@@ -26,6 +26,9 @@ public interface Serializer {
     void serialize(EntityModel type, Writer writer) throws IOException;
     
     /**
+     * Get a String representation of the Querydsl type for the given TypeModel
+     * in tyhe given EntityModel context
+     * 
      * @param type
      * @param model
      * @param raw
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleClassTypeModel.java b/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleClassTypeModel.java
index 2c7b97600..a83a103e9 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleClassTypeModel.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/SimpleClassTypeModel.java
@@ -16,6 +16,8 @@ import org.apache.commons.lang.ClassUtils;
 import com.mysema.commons.lang.Assert;
 
 /**
+ * SimpleClassTypeModel is a minimal implementation of the TypeModel interface
+ * 
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java
index 277d7b34a..f1709c3ff 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java
@@ -10,6 +10,8 @@ import java.io.IOException;
 import net.jcip.annotations.Immutable;
 
 /**
+ * SupertypeSerializer is a Serializer implementation for supertypes
+ * 
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeCategory.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeCategory.java
index 096b8b5c7..549714cf7 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeCategory.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeCategory.java
@@ -24,7 +24,7 @@ import com.mysema.query.annotations.PropertyType;
 @Immutable
 public enum TypeCategory {
     /**
-     * Simple non-entity fields
+     * 
      */           
     SIMPLE(null),
     /**
@@ -48,19 +48,19 @@ public enum TypeCategory {
      */
     ARRAY(null),
     /**
-     * Comparable literal fields (? extends Comparable)
+     * 
      */
     COMPARABLE(SIMPLE),
     /**
-     * Boolean files
+     * 
      */
     BOOLEAN(COMPARABLE, Boolean.class.getName()),     
     /**
-     * Date fields
+     *  
      */
     DATE(COMPARABLE, java.sql.Date.class.getName(), "org.joda.time.LocalDate"),
     /**
-     * Date/Time fields
+     * 
      */
     DATETIME(COMPARABLE, 
         java.util.Calendar.class.getName(),
@@ -71,20 +71,20 @@ public enum TypeCategory {
         "org.joda.time.DateTime", 
         "org.joda.time.DateMidnight"),    
     /**
-     * Entity fields
+     * 
      */
     ENTITY(null),
     
     /**
-     * Numeric fields (? extends Number & Comparable)
+     * 
      */
     NUMERIC(COMPARABLE),     
     /**
-     * String fields
+     * 
      */
     STRING(COMPARABLE, String.class.getName()),
     /**
-     * Time fields
+     * 
      */
     TIME(COMPARABLE, java.sql.Time.class.getName(), "org.joda.time.LocalTime");
     
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeExtendsModel.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeExtendsModel.java
index cf25d9195..7b3cbd042 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeExtendsModel.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeExtendsModel.java
@@ -6,6 +6,8 @@
 package com.mysema.query.codegen;
 
 /**
+ * TypeExtendsModel is a TypeModel for type variables and wildcard types
+ * 
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModel.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModel.java
index 909047399..5d567a69b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModel.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModel.java
@@ -8,6 +8,8 @@ package com.mysema.query.codegen;
 import javax.annotation.Nullable;
 
 /**
+ * TypeModel represents Java types
+ * 
  * @author tiwe
  * 
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModelAdapter.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModelAdapter.java
index a6ec25174..71acb0fc2 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModelAdapter.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeModelAdapter.java
@@ -8,6 +8,8 @@ package com.mysema.query.codegen;
 import com.mysema.commons.lang.Assert;
 
 /**
+ * TypeModelAdapter is a basic adapter implementation for the TypeModel interface
+ * 
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeSuperModel.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeSuperModel.java
index cbd388b4a..ea02aa5c9 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeSuperModel.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeSuperModel.java
@@ -6,6 +6,8 @@
 package com.mysema.query.codegen;
 
 /**
+ * TypeSuperModel is a TypeModel for type variables and wildcard types
+ * 
  * @author tiwe
  *
  */