diff --git a/pom.xml b/pom.xml
index a561213..f8b4f7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,10 +139,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.9.1</version>
         <configuration>
           <quiet>true</quiet>
           <show>public</show>
+          <sourceFileExcludes>
+            <exclude>com/samskivert/gwt/**</exclude>
+          </sourceFileExcludes>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/java/com/samskivert/mustache/BasicCollector.java b/src/main/java/com/samskivert/mustache/BasicCollector.java
index a90f5f4..f9278c1 100644
--- a/src/main/java/com/samskivert/mustache/BasicCollector.java
+++ b/src/main/java/com/samskivert/mustache/BasicCollector.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 /**
- * A collector that does not use reflection and can be used in GWT.
+ * A collector that does not use reflection and can be used with GWT.
  */
 public abstract class BasicCollector implements Mustache.Collector
 {
diff --git a/src/main/java/com/samskivert/mustache/Mustache.java b/src/main/java/com/samskivert/mustache/Mustache.java
index 5b74064..f8788e7 100644
--- a/src/main/java/com/samskivert/mustache/Mustache.java
+++ b/src/main/java/com/samskivert/mustache/Mustache.java
@@ -27,7 +27,7 @@ import java.util.Map;
  */
 public class Mustache
 {
-    /** An interface to the Mustache compilation process. See {@link Mustache}. */
+    /** Compiles templates into executable form. See {@link Mustache}. */
     public static class Compiler
     {
         /** Whether or not standards mode is enabled. */
@@ -191,7 +191,7 @@ public class Mustache
         }
     }
 
-    /** Used to handle lambdas. */
+    /** Handles lambdas. */
     public interface Lambda
     {
         /** Executes this lambda on the supplied template fragment. The lambda should write its
@@ -203,21 +203,21 @@ public class Mustache
         void execute (Template.Fragment frag, Writer out) throws IOException;
     }
 
-    /** Used to read variables from values. */
+    /** Reads variables from context objects. */
     public interface VariableFetcher
     {
         /** Reads the so-named variable from the supplied context object. */
         Object get (Object ctx, String name) throws Exception;
     }
 
-    /** Handles escaper characters in substituted text. */
+    /** Handles escaping characters in substituted text. */
     public interface Escaper
     {
         /** Returns {@code raw} with the appropriate characters replaced with escape sequences. */
         String escape (String raw);
     }
 
-    /** Used to handle partials. */
+    /** Handles loading partial templates. */
     public interface TemplateLoader
     {
         /** Returns a reader for the template with the supplied name.