diff --git a/core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java b/core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java
index 556c600d..8f5fd77c 100644
--- a/core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java
+++ b/core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * Copyright 2006-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,10 @@ import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * The <code>WebServiceMessageFactory</code> serves as factory for {@link org.springframework.ws.WebServiceMessage
- * WebServiceMessages}. Allows creation of empty messages, or messages based on <code>InputStream</code>s.
+ * The <code>WebServiceMessageFactory</code> serves as a factory for
+ * {@link org.springframework.ws.WebServiceMessage WebServiceMessages}.
+ *
+ * <p>Allows the creation of empty messages, or messages based on <code>InputStream</code>s.
  *
  * @author Arjen Poutsma
  * @see org.springframework.ws.WebServiceMessage
@@ -36,10 +38,11 @@ public interface WebServiceMessageFactory {
     WebServiceMessage createWebServiceMessage();
 
     /**
-     * Reads {@link WebServiceMessage} from the given input stream.
+     * Reads a {@link WebServiceMessage} from the given input stream.
      * <p/>
-     * If the given stream is an instance of {@link org.springframework.ws.transport.TransportInputStream
-     * TransportInputStream}, the headers will be read from the request.
+     * If the given stream is an instance of
+     * {@link org.springframework.ws.transport.TransportInputStream TransportInputStream},
+     * the headers will be read from the request.
      *
      * @param inputStream the inputstream to read the message from
      * @return the created message
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java
index 3ee27d90..be26cd92 100644
--- a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java
+++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java
@@ -179,10 +179,10 @@ public abstract class AbstractMarshallingPayloadEndpoint implements MessageEndpo
     /**
      * Template method that subclasses must implement to process a request.
      * <p/>
-     * The unmarshaled request object is passed as a parameter, and an the returned object is marshalled to a response.
+     * The unmarshaled request object is passed as a parameter, and the returned object is marshalled to a response.
      * If no response is required, return <code>null</code>.
      *
-     * @param requestObject the unnmarshalled message payload as object
+     * @param requestObject the unnmarshalled message payload as an object
      * @return the object to be marshalled as response, or <code>null</code> if a response is not required
      */
     protected abstract Object invokeInternal(Object requestObject) throws Exception;
diff --git a/oxm/src/main/java/org/springframework/oxm/Marshaller.java b/oxm/src/main/java/org/springframework/oxm/Marshaller.java
index a5e25a08..99bac694 100644
--- a/oxm/src/main/java/org/springframework/oxm/Marshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/Marshaller.java
@@ -20,7 +20,7 @@ import javax.xml.transform.Result;
 
 /**
  * Defines the contract for Object XML Mapping Marshallers. Implementations of this interface can serialize a given
- * Object to a XML Stream.
+ * Object to an XML Stream.
  * <p/>
  * Although the <code>marshal</code> method accepts a <code>java.lang.Object</code> as its first parameter, most
  * <code>Marshaller</code> implementations cannot handle arbitrary <code>java.lang.Object</code>. Instead, a object