diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/entries/AcceptAllEntryListFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/entries/AcceptAllEntryListFilter.java
index 735caee080..deb9c1abf1 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/entries/AcceptAllEntryListFilter.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/entries/AcceptAllEntryListFilter.java
@@ -21,6 +21,7 @@ package org.springframework.integration.file.entries;
  * Simple NOOP implementation for {@link org.springframework.integration.file.entries.EntryListFilter} implementation.
  * Suitable as a default in implementations.
  *
+ * @author Iwein Fuld
  * @author Josh Long
  * @param <T>
  */
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/entries/CompositeEntryListFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/entries/CompositeEntryListFilter.java
index 4321610e80..0ee88f6033 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/entries/CompositeEntryListFilter.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/entries/CompositeEntryListFilter.java
@@ -20,7 +20,15 @@ import org.springframework.util.Assert;
 
 import java.util.*;
 
-
+/**
+ * Simple {@link org.springframework.integration.file.entries.EntryListFilter} that predicates its matches
+ * against any of many configured {@link org.springframework.integration.file.entries.EntryListFilter}
+ *
+ * @author Iwein Fuld
+ * @author Josh Long
+ *
+ * @param <T>
+ */
 public class CompositeEntryListFilter<T> implements EntryListFilter<T> {
 	private final Set<EntryListFilter<T>> fileFilters;
 
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/entries/PatternMatchingEntryListFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/entries/PatternMatchingEntryListFilter.java
index 590748618a..fe9778f77b 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/entries/PatternMatchingEntryListFilter.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/entries/PatternMatchingEntryListFilter.java
@@ -23,11 +23,12 @@ import java.util.regex.Pattern;
 
 
 /**
- * <emphasis>experimental</emphasis>
- * <p/>
+ *
+ *
  * Filters a listing of entries (T) by qualifying their 'name' (as determined by {@link org.springframework.integration.file.entries.EntryNamer})
  * against a regular expression (an instance of {@link java.util.regex.Pattern})
  *
+ * @author Iwein Fuld
  * @author Josh Long
  * @param <T>   the type of entry
  */
@@ -59,7 +60,7 @@ public class PatternMatchingEntryListFilter<T> extends AbstractEntryListFilter<T
 			this.pattern = Pattern.compile(this.patternExpression);
 		}
 		Assert.notNull(this.entryNamer, "'entryNamer' must not be null!");
-		Assert.notNull(this.pattern, "'pattern' mustn't be null!");
+		Assert.notNull(this.pattern, "'pattern' must not be null!");
 	}
 
 	@Override
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpClientFactory.java
index bbad3735fd..bc61faa16a 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/AbstractFtpClientFactory.java
@@ -13,7 +13,15 @@ import org.springframework.util.StringUtils;
 import java.io.IOException;
 import java.net.SocketException;
 
-
+/**
+ *
+ * base class for the other {@link org.springframework.integration.ftp.FtpClientFactory} implementations.
+ * Most of this came out of the {@link DefaultFtpClientFactory} and was refactored into a base class
+ *
+ * @author Iwein Fuld
+ *
+ * @param <T>
+ */
 abstract public class AbstractFtpClientFactory<T extends FTPClient> implements FtpClientFactory<T> {
 	private static final Log logger = LogFactory.getLog(FtpClientFactory.class);
 	private static final String DEFAULT_REMOTE_WORKING_DIRECTORY = "/";
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpsClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpsClientFactory.java
index 9a7d539ce0..1cf3ec4ed1 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpsClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/DefaultFtpsClientFactory.java
@@ -26,9 +26,10 @@ import javax.net.ssl.TrustManager;
 
 
 /**
- * provides a working FTPS implementation
- *
+ * provides a working FTPS implementation. Based heavily on {@link org.springframework.integration.ftp.DefaultFtpClientFactory}
+ * 
  * @author Josh Long
+ * @author Iwein Fuld
  */
 public class DefaultFtpsClientFactory extends AbstractFtpClientFactory<FTPSClient> {
     private Boolean useClientMode;
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
index 26782253f5..b5c0d0dd77 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
@@ -13,6 +13,7 @@ import org.springframework.core.io.ResourceLoader;
 /**
  * A factory bean implementation that handles constructing an outbound FTP adapter.
  *
+ * @author Iwein Fuld
  * @author Josh Long
  */
 public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<FtpSendingMessageHandler> implements ResourceLoaderAware, ApplicationContextAware {
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java
index d74ccfb216..3c3fe92583 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java
@@ -3,6 +3,12 @@ package org.springframework.integration.ftp;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.TrustManager;
 
+/**
+ * Sends files to a remote FTPS file system. Based heavily on {@link org.springframework.integration.ftp.FtpSendingMessageHandler}
+ *
+ * @author Josh Long
+ * @author Iwein Fuld
+ */
 public class FtpsSendingMessageHandlerFactoryBean extends FtpSendingMessageHandlerFactoryBean {
 	/**
 	   * Sets whether the connection is implicit. Local testing reveals this to be a good choice.
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizer.java
index 2b9cfc1c19..1e589af800 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizer.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizer.java
@@ -21,6 +21,7 @@ import java.util.Collection;
 /**
  * An FTP-adapter implementation of {@link org.springframework.integration.file.AbstractInboundRemoteFileSystemSychronizer}
  *
+ * @author Iwein Fuld
  * @author Josh Long
  */
 public class FtpInboundRemoteFileSystemSynchronizer extends AbstractInboundRemoteFileSystemSychronizer<FTPFile> {
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizingMessageSource.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizingMessageSource.java
index c868fd0c8c..75d78a3845 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizingMessageSource.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpInboundRemoteFileSystemSynchronizingMessageSource.java
@@ -8,6 +8,7 @@ import org.springframework.integration.ftp.FtpClientPool;
 /**
  * a {@link org.springframework.integration.core.MessageSource} implementation for FTP
  *
+ * @author Iwein Fuld
  * @author Josh Long
  */
 public class FtpInboundRemoteFileSystemSynchronizingMessageSource extends AbstractInboundRemoteFileSystemSynchronizingMessageSource<FTPFile, FtpInboundRemoteFileSystemSynchronizer> {
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
index 2713aee47b..d656f01c1f 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
@@ -21,6 +21,7 @@ import java.io.File;
 /**
  * Factory to make building the namespace easier
  *
+ * @author Iwein Fuld
  * @author Josh Long
  */
 public class FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean extends AbstractFactoryBean<FtpInboundRemoteFileSystemSynchronizingMessageSource> implements ResourceLoaderAware {
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
index 76dfa16115..ce47821db8 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
@@ -30,6 +30,7 @@ import javax.net.ssl.TrustManager;
 /**
  * Factory to make building the namespace easier
  *
+ * @author Iwein Fuld
  * @author Josh Long
  */
 public class FtpsRemoteFileSystemSynchronizingMessageSourceFactoryBean extends FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean {
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java
index 4e2cbe8960..41ca6416c9 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java
@@ -28,7 +28,8 @@ import org.w3c.dom.Element;
 
 
 /**
- * Provides namespace support for using SFTP
+ * Provides namespace support for using SFTP.
+ * This is very largely based on the FTP support by Iwein Fuld.
  *
  * @author Josh Long
  */