diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java
index b84c3183..d5593673 100644
--- a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java
+++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java
@@ -29,11 +29,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 /**
- * Abstract base class for endpoints that handle the message payload as DOM elements. Offers the message payload as a
- * DOM <code>Element</code>, and allows subclasses to create a response by returning an <code>Element</code>.
- * <p/>
- * An <code>AbstractDomPayloadEndpoint</code> only accept one payload element. Multiple payload elements are not in
- * accordance with WS-I.
+ * Abstract base class for endpoints that handle the message payload as DOM elements.
+ *
+ * <p>Offers the message payload as a DOM <code>Element</code>, and allows subclasses to create a response by returning
+ * an <code>Element</code>.
+ *
+ * <p>An <code>AbstractDomPayloadEndpoint</code> only accept <i>one</i> payload element. Multiple payload elements are
+ * not in accordance with WS-I.
  *
  * @author Arjen Poutsma
  * @author Alef Arendsen
@@ -110,10 +112,12 @@ public abstract class AbstractDomPayloadEndpoint extends TransformerObjectSuppor
     }
 
     /**
-     * Template method. Subclasses must implement this. Offers the request payload as a DOM <code>Element</code>, and
-     * allows subclasses to return a response <code>Element</code>.
-     * <p/>
-     * The given DOM <code>Document</code> is to be used for constructing <code>Node</code>s, by using the various
+     * Template method that subclasses must implement to process the request.
+     *
+     * <p>Offers the request payload as a DOM <code>Element</code>, and allows subclasses to return a response
+     * <code>Element</code>.
+     *
+     * <p>The given DOM <code>Document</code> is to be used for constructing <code>Node</code>s, by using the various
      * <code>create</code> methods.
      *
      * @param requestElement   the contents of the SOAP message as DOM elements
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java
index ed753826..64575b95 100644
--- a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java
+++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java
@@ -25,14 +25,15 @@ import org.jdom.transform.JDOMSource;
 import org.springframework.xml.transform.TransformerObjectSupport;
 
 /**
- * Abstract base class for endpoints that handle the message payload as JDOM elements. Offers the message payload as a
- * JDOM <code>Element</code>, and allows subclasses to create a response by returning an <code>Element</code>.
- * <p/>
- * An <code>AbstractJDomPayloadEndpoint</code> only accept one payload element. Multiple payload elements are not in
- * accordance with WS-I.
+ * Abstract base class for endpoints that handle the message payload as JDOM elements.
+ *
+ * <p>Offers the message payload as a JDOM {@link Element}, and allows subclasses to create a response by returning an
+ * <code>Element</code>.
+ *
+ * <pAn <code>AbstractJDomPayloadEndpoint</code> can accept only <i>one</i> payload element. Multiple payload elements
+ * are not in accordance with WS-I.
  *
  * @author Arjen Poutsma
- * @see Element
  */
 public abstract class AbstractJDomPayloadEndpoint extends TransformerObjectSupport implements PayloadEndpoint {
 
@@ -53,6 +54,4 @@ public abstract class AbstractJDomPayloadEndpoint extends TransformerObjectSuppo
      * @return the response element. Can be <code>null</code> to specify no response.
      */
     protected abstract Element invokeInternal(Element requestElement) throws Exception;
-
-
 }
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java
index cae80d5e..c3c7ae67 100644
--- a/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java
+++ b/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java
@@ -19,12 +19,11 @@ package org.springframework.ws.server.endpoint;
 import javax.xml.transform.Source;
 
 /**
- * Defines the basic contract for Web Services interested in the mesage payload.
- * <p/>
- * The main entrypoint is <code>invoke</code>, which gets invoked with the contents of the requesting message.
+ * Defines the basic contract for Web Services interested in just the message payload.
+ *
+ * <p>The main entrypoint is {@link #invoke(Source)}, which gets invoked with the contents of the requesting message.
  *
  * @author Arjen Poutsma
- * @see #invoke(javax.xml.transform.Source)
  */
 public interface PayloadEndpoint {
 
diff --git a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
index 2a249bee..2c4c8b43 100644
--- a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
+++ b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
@@ -76,7 +76,7 @@ public abstract class AbstractWebServiceMessageTestCase extends XMLTestCase {
     }
 
     public void testHasFault() throws Exception {
-        assertFalse("Mesage has fault", webServiceMessage.hasFault());
+        assertFalse("Message has fault", webServiceMessage.hasFault());
     }
 
     public void testDomPayload() throws Exception {
diff --git a/core/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java b/core/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java
index d91fe635..05cef1a1 100644
--- a/core/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java
+++ b/core/src/test/java/org/springframework/ws/client/support/WebServiceAccessorTest.java
@@ -47,7 +47,7 @@ public class WebServiceAccessorTest extends TestCase {
         factoryControl.replay();
         messageControl.replay();
         MessageContext messageContext = accessor.createMessageContext();
-        assertNotNull("No MesageContext created", messageContext);
+        assertNotNull("No MessageContext created", messageContext);
         factoryControl.verify();
         messageControl.verify();
     }