diff --git a/src/main/java/com/mysema/codegen/CodeWriter.java b/src/main/java/com/mysema/codegen/CodeWriter.java
index c2ea2eb3b..ad0f7a0f1 100644
--- a/src/main/java/com/mysema/codegen/CodeWriter.java
+++ b/src/main/java/com/mysema/codegen/CodeWriter.java
@@ -12,6 +12,8 @@ import java.util.Collection;
 import org.apache.commons.collections15.Transformer;
 
 /**
+ * CodeWriter defines an interface for serializing Java source code
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/JavaWriter.java b/src/main/java/com/mysema/codegen/JavaWriter.java
index e11aea5a7..eab97219a 100644
--- a/src/main/java/com/mysema/codegen/JavaWriter.java
+++ b/src/main/java/com/mysema/codegen/JavaWriter.java
@@ -26,6 +26,8 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 
 /**
+ * JavaWriter is the default implementation of the CodeWriter interface
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/LocationAndKind.java b/src/main/java/com/mysema/codegen/LocationAndKind.java
index 41327cf40..779e8a620 100644
--- a/src/main/java/com/mysema/codegen/LocationAndKind.java
+++ b/src/main/java/com/mysema/codegen/LocationAndKind.java
@@ -11,6 +11,8 @@ import javax.tools.JavaFileManager.Location;
 import javax.tools.JavaFileObject.Kind;
 
 /**
+ * LocationAndKind defines a pair of Location and Kind
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/MemClassLoader.java b/src/main/java/com/mysema/codegen/MemClassLoader.java
index e52dec5fa..130d11f6a 100644
--- a/src/main/java/com/mysema/codegen/MemClassLoader.java
+++ b/src/main/java/com/mysema/codegen/MemClassLoader.java
@@ -23,6 +23,8 @@ import javax.tools.JavaFileObject.Kind;
 
 
 /**
+ * MemClassLoader is a mmemory based implementation of the ClassLoader interface
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/MemFileManager.java b/src/main/java/com/mysema/codegen/MemFileManager.java
index 33cfe0703..a7174f404 100644
--- a/src/main/java/com/mysema/codegen/MemFileManager.java
+++ b/src/main/java/com/mysema/codegen/MemFileManager.java
@@ -25,6 +25,8 @@ import javax.tools.JavaFileObject.Kind;
 
 
 /**
+ * MemFileManager is a memory based implementation of the JavaFileManager interface
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/MemJavaFileObject.java b/src/main/java/com/mysema/codegen/MemJavaFileObject.java
index 549592453..adcdaff46 100644
--- a/src/main/java/com/mysema/codegen/MemJavaFileObject.java
+++ b/src/main/java/com/mysema/codegen/MemJavaFileObject.java
@@ -18,6 +18,8 @@ import java.net.URI;
 import javax.tools.SimpleJavaFileObject;
 
 /**
+ * MemJavaFileObject defines an in memory compiled Java file
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/MemSourceFileObject.java b/src/main/java/com/mysema/codegen/MemSourceFileObject.java
index 41960b410..90283341d 100644
--- a/src/main/java/com/mysema/codegen/MemSourceFileObject.java
+++ b/src/main/java/com/mysema/codegen/MemSourceFileObject.java
@@ -14,6 +14,8 @@ import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 
 /**
+ * MemSourceFileObject defines a in-memory Java source file object
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/SimpleCompiler.java b/src/main/java/com/mysema/codegen/SimpleCompiler.java
index ee4b188ca..251eb07f9 100644
--- a/src/main/java/com/mysema/codegen/SimpleCompiler.java
+++ b/src/main/java/com/mysema/codegen/SimpleCompiler.java
@@ -28,6 +28,9 @@ import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
 
 /**
+ * SimpleCompiler provides a convenience wrapper of the JavaCompiler interface with automatic
+ * classpath generation
+ * 
  * @author tiwe
  *
  */
diff --git a/src/main/java/com/mysema/codegen/Symbols.java b/src/main/java/com/mysema/codegen/Symbols.java
index d297ae3c7..d6c9371db 100644
--- a/src/main/java/com/mysema/codegen/Symbols.java
+++ b/src/main/java/com/mysema/codegen/Symbols.java
@@ -6,6 +6,8 @@
 package com.mysema.codegen;
 
 /**
+ * Defines general String constants
+ * 
  * @author tiwe
  *
  */