diff --git a/build.gradle b/build.gradle
index 563eb78c..de3a7d24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -114,7 +114,7 @@ javadoc {
       ]
   
      links = [
-        "http://static.springframework.org/spring/docs/3.0.x/javadoc-api",
+        "http://static.springframework.org/spring/docs/3.1.x/javadoc-api",
         "http://download.oracle.com/javase/6/docs/api",
         "http://www.gemstone.com/docs/6.5.1/product/docs/japi/",
         "http://asm.objectweb.org/asm223/javadoc/user",
diff --git a/src/main/java/org/springframework/data/gemfire/client/package-info.java b/src/main/java/org/springframework/data/gemfire/client/package-info.java
index 174703f2..d389150b 100644
--- a/src/main/java/org/springframework/data/gemfire/client/package-info.java
+++ b/src/main/java/org/springframework/data/gemfire/client/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * Classes providing support for GemFire client configuration.
diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java
index 116b9be0..c4a4db4d 100644
--- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java
@@ -324,7 +324,7 @@ public class ContinuousQueryListenerContainer implements InitializingBean, Dispo
 	/**
 	 * Set the name of the {@link Pool} used for performing the queries by this container.
 	 * 
-	 * @param service
+	 * @param poolName the name of the pool to be used by the container
 	 */
 	public void setPoolName(String poolName) {
 		this.poolName = poolName;
@@ -344,7 +344,7 @@ public class ContinuousQueryListenerContainer implements InitializingBean, Dispo
 	 * Adds a query definition to the (potentially running) container. If the container is running,
 	 * the listener starts receiving (matching) messages as soon as possible.
 	 * 
-	 * @param listener event cqQuery
+	 * @param cqQuery cqQuery definition
 	 */
 	public void addListener(ContinuousQueryDefinition cqQuery) {
 		doAddListener(cqQuery);
diff --git a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java
index 89bfb852..c6f755b8 100644
--- a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java
+++ b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java
@@ -26,8 +26,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.gemfire.listener.GemfireListenerExecutionFailedException;
 import org.springframework.data.gemfire.listener.ContinuousQueryListener;
+import org.springframework.data.gemfire.listener.GemfireListenerExecutionFailedException;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils.MethodCallback;
@@ -78,7 +78,7 @@ public class ContinuousQueryListenerAdapter implements ContinuousQueryListener {
 		MethodInvoker(Object delegate, final String methodName) {
 			this.delegate = delegate;
 
-			Class c = delegate.getClass();
+			Class<?> c = delegate.getClass();
 
 			methods = new ArrayList<Method>();
 
@@ -314,7 +314,7 @@ public class ContinuousQueryListenerAdapter implements ContinuousQueryListener {
 	/**
 	 * Invoke the specified listener method.
 	 * @param event the event arguments to be passed in
-	 * @return the result returned from the listener method
+	 * @param methodName the method to invoke
 	 * @see #getListenerMethodName
 	 */
 	protected void invokeListenerMethod(CqEvent event, String methodName) {
diff --git a/src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java b/src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java
new file mode 100644
index 00000000..9fa292f2
--- /dev/null
+++ b/src/main/java/org/springframework/data/gemfire/listener/adapter/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Continuous query listener adapter package.
+ * The adapter delegates to target listener methods, converting GemFire events to the requested argument types 
+ * that get passed into listener methods. 
+ */
+package org.springframework.data.gemfire.listener.adapter;
+
diff --git a/src/main/java/org/springframework/data/gemfire/listener/package-info.java b/src/main/java/org/springframework/data/gemfire/listener/package-info.java
new file mode 100644
index 00000000..4806cdab
--- /dev/null
+++ b/src/main/java/org/springframework/data/gemfire/listener/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Base package for GemFire continuous query listener / container facility 
+ */
+package org.springframework.data.gemfire.listener;
+