diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java
index 6a41c4c94..5f238e7d7 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java
@@ -18,6 +18,7 @@ import java.io.IOException;
 import java.util.*;
 
 import javax.annotation.Nullable;
+import javax.jdo.JDOUserException;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 
@@ -278,7 +279,7 @@ public abstract class AbstractJDOQuery<T, Q extends AbstractJDOQuery<T, Q>> exte
 
     /**
      * Set the maximum fetch depth when fetching.
-     * A value of 0 has no meaning and will throw a JDOUserException.
+     * A value of 0 has no meaning and will throw a {@link JDOUserException}.
      * A value of -1 means that no limit is placed on fetching.
      * A positive integer will result in that number of references from the
      * initial object to be fetched.
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java
index a59820060..c60cf62d2 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java
@@ -24,7 +24,7 @@ import com.querydsl.core.types.dsl.Expressions;
 public final class JDOExpressions {
 
     /**
-     * Create a new detached JDOQuery instance with the given projection
+     * Create a new detached {@link JDOQuery} instance with the given projection
      *
      * @param expr projection
      * @param <T>
@@ -35,7 +35,7 @@ public final class JDOExpressions {
     }
 
     /**
-     * Create a new detached JDOQuery instance with the given projection
+     * Create a new detached {@link JDOQuery} instance with the given projection
      *
      * @param exprs projection
      * @return select(exprs)
@@ -45,29 +45,29 @@ public final class JDOExpressions {
     }
 
     /**
-     * Create a new detached JDOQuery instance with the given projection
+     * Create a new detached {@link JDOQuery} instance with the given projection
      *
      * @param expr projection
      * @param <T>
      * @return select(distinct expr)
      */
     public static <T> JDOQuery<T> selectDistinct(Expression<T> expr) {
-        return new JDOQuery<Void>().select(expr).distinct();
+        return select(expr).distinct();
     }
 
     /**
-     * Create a new detached JDOQuery instance with the given projection
+     * Create a new detached {@link JDOQuery} instance with the given projection
      *
      * @param exprs projection
      * @return select(distinct exprs)
      */
     public static JDOQuery<Tuple> selectDistinct(Expression<?>... exprs) {
-        return new JDOQuery<Void>().select(exprs).distinct();
+        return select(exprs).distinct();
     }
 
 
     /**
-     * Create a new detached JDOQuery instance with the given projection 0
+     * Create a new detached {@link JDOQuery} instance with the given projection 0
      *
      * @return select(0)
      */
@@ -76,7 +76,7 @@ public final class JDOExpressions {
     }
 
     /**
-     * Create a new detached JDOQuery instance with the projection 1
+     * Create a new detached {@link JDOQuery} instance with the projection 1
      *
      * @return select(1)
      */
@@ -85,7 +85,7 @@ public final class JDOExpressions {
     }
 
     /**
-     * Create a new detached JDOQuery instance with the given projection
+     * Create a new detached {@link JDOQuery} instance with the given projection
      *
      * @param expr projection and source
      * @param <T>
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java
index 5b80c13dd..3e75c3ad2 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java
@@ -62,7 +62,7 @@ public interface JDOQLQuery<T> extends FetchableQuery<T, JDOQLQuery<T>>, Query<J
     /**
      * Add the fetch group to the set of active fetch groups.
      * 
-     * @param fetchGroupName fetch group  name
+     * @param fetchGroupName fetch group name
      * @return the current object
      */
     JDOQLQuery<T> addFetchGroup(String fetchGroupName);
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java
index d837af66b..b56524190 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java
@@ -27,7 +27,7 @@ import com.querydsl.core.types.*;
 import com.querydsl.core.types.dsl.Param;
 
 /**
- * JDOQLSerializer serializes Querydsl queries and expressions into JDOQL strings
+ * {@code JDOQLSerializer} serializes Querydsl queries and expressions into JDOQL strings
  *
  * @author tiwe
  *
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java
index ae4879120..1d0198274 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java
@@ -21,7 +21,7 @@ import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Expression;
 
 /**
- * {@code JDOQuery} is the default implementation of the JDOQLQuery interface
+ * {@code JDOQuery} is the default implementation of the {@link JDOQLQuery} interface
  *
  * @author tiwe
  *
@@ -30,7 +30,7 @@ import com.querydsl.core.types.Expression;
 public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
 
     /**
-     * Create a detached JDOQuery instance
+     * Create a detached {@link JDOQuery} instance
      * The query can be attached via the clone method
      *
      */
@@ -39,7 +39,7 @@ public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
     }
 
     /**
-     * Create a new JDOQuery instance
+     * Create a new {@link JDOQuery} instance
      *
      * @param persistenceManager PersistenceManager instance to use
      * @param templates JDOQLTemplates to use
@@ -50,7 +50,7 @@ public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
     }
 
     /**
-     * Create a new JDOQuery instance
+     * Create a new {@link JDOQuery} instance
      *
      * @param persistenceManager PersistenceManager instance to use
      * @param detach detached results or not
@@ -60,7 +60,7 @@ public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
     }
 
     /**
-     * Create a new JDOQuery instance
+     * Create a new {@link JDOQuery} instance
      *
      * @param persistenceManager PersistenceManager instance to use
      */
@@ -69,7 +69,7 @@ public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
     }
 
     /**
-     * Create a new JDOQuery instance
+     * Create a new {@link JDOQuery} instance
      * 
      * @param persistenceManager PersistenceManager instance to use
      * @param templates templates to use
@@ -82,7 +82,7 @@ public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
     }
 
     /**
-     * Clone the state of this query to a new JDOQuery instance with the given PersistenceManager
+     * Clone the state of this query to a new {@link JDOQuery} instance with the given {@link PersistenceManager}
      *
      * @param persistenceManager PersistenceManager instance to use
      * @return cloned query
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java
index 5ac90432e..5c998bbac 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java
@@ -42,7 +42,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the given projection
+     * Create a new {@link JDOQuery} instance with the given projection
      *
      * @param expr projection
      * @param <T>
@@ -53,7 +53,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the given projection
+     * Create a new {@link JDOQuery} instance with the given projection
      *
      * @param exprs projection
      * @return select(exprs)
@@ -63,7 +63,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the given projection
+     * Create a new {@link JDOQuery} instance with the given projection
      *
      * @param expr projection
      * @param <T>
@@ -74,7 +74,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the given projection
+     * Create a new {@link JDOQuery} instance with the given projection
      *
      * @param exprs projection
      * @return select(distinct exprs)
@@ -84,7 +84,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the projection zero
+     * Create a new {@link JDOQuery} instance with the projection 0
      *
      * @return select(0)
      */
@@ -93,7 +93,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the projection one
+     * Create a new {@link JDOQuery} instance with the projection 1
      *
      * @return select(1)
      */
@@ -102,7 +102,7 @@ public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
     }
 
     /**
-     * Create a new JDOQuery instance with the given projection
+     * Create a new {@link JDOQuery} instance with the given projection
      *
      * @param expr projection and source
      * @param <T>
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java
index bec33ecd7..24866abed 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java
@@ -19,7 +19,7 @@ import com.querydsl.core.support.QueryMixin;
 import com.querydsl.core.types.*;
 
 /**
- * {@code JDOQueryMixin} extends {@link QueryMixin} to provide module specific extensions
+ * {@code JDOQueryMixin} extends {@link QueryMixin} to provide module-specific extensions
  * 
  * @author tiwe
  *
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java
index 8c4542997..507b6fce8 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java
@@ -30,7 +30,7 @@ import com.querydsl.core.types.EntityPath;
 import com.querydsl.core.types.Predicate;
 
 /**
- * DeleteClause implementation for JDO
+ * {@link DeleteClause} implementation for JDO
  *
  * @author tiwe
  *
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java
index 36e6ff2f3..31653397d 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java
@@ -26,7 +26,7 @@ import com.querydsl.core.types.Path;
 import com.querydsl.core.types.Predicate;
 
 /**
- * UpdateClause implementation for JDO
+ * {@link UpdateClause} implementation for JDO
  *
  * @author tiwe
  *
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java
index b241203c0..c6e64125c 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java
@@ -36,10 +36,11 @@ import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.FactoryExpression;
 import com.querydsl.sql.Configuration;
 import com.querydsl.sql.ProjectableSQLQuery;
+import com.querydsl.sql.SQLQuery;
 import com.querydsl.sql.SQLSerializer;
 
 /**
- * Base class for JDO based SQLQuery implementations
+ * Base class for JDO-based {@link SQLQuery} implementations
  *
  * @author tiwe
  *
@@ -117,7 +118,7 @@ public abstract class AbstractSQLQuery<T, Q extends AbstractSQLQuery<T, Q>> exte
         if (logger.isDebugEnabled()) {
             logger.debug(serializer.toString());
         }
-        Query query = persistenceManager.newQuery("javax.jdo.query.SQL",serializer.toString());
+        Query query = persistenceManager.newQuery("javax.jdo.query.SQL", serializer.toString());
         orderedConstants = serializer.getConstants();
         queries.add(query);
 
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java
index eb98e8616..44b3c2b07 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java
@@ -21,11 +21,12 @@ import com.querydsl.core.QueryMetadata;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Expression;
 import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLQuery;
 import com.querydsl.sql.SQLSerializer;
 import com.querydsl.sql.SQLTemplates;
 
 /**
- * JDOSQLQuery is an SQLQuery implementation that uses JDO's SQL query functionality
+ * {@code JDOSQLQuery} is a {@link SQLQuery} implementation that uses JDO's SQL query functionality
  * to execute queries
  *
  * @author tiwe