diff --git a/spring-batch-admin-parent/pom.xml b/spring-batch-admin-parent/pom.xml
index 9e4ac42d8..d92051ec3 100644
--- a/spring-batch-admin-parent/pom.xml
+++ b/spring-batch-admin-parent/pom.xml
@@ -9,7 +9,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.batch.version>2.1.1.RELEASE</spring.batch.version>
-		<spring.framework.version>3.0.3.RELEASE</spring.framework.version>
+		<spring.framework.version>3.0.4.RELEASE</spring.framework.version>
 		<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
 	</properties>
 	<profiles>
diff --git a/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs b/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs
index c0f6d5e6b..21e52fdf1 100644
--- a/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs
+++ b/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs
@@ -1,4 +1,4 @@
-#Thu Aug 12 16:11:37 BST 2010
+#Fri Aug 20 12:09:08 BST 2010
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkStepIntegrationTests-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1102" endstart\="1096" start\="901" startend\="967"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n<element type\="job">\n<structure end\="1473" endstart\="1467" start\="1107" startend\="1182"/>\n<bounds height\="118" width\="127" x\="106" y\="17"/>\n</element>\n</graph>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<graph>\r\n<element type\="job">\r\n<structure end\="1667" endstart\="1661" start\="1306" startend\="1372"/>\r\n<bounds height\="118" width\="75" x\="15" y\="17"/>\r\n</element>\r\n</graph>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<graph>\r\n<element type\="job">\r\n<structure end\="1767" endstart\="1761" start\="1416" startend\="1482"/>\r\n<bounds height\="118" width\="75" x\="15" y\="17"/>\r\n</element>\r\n</graph>
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
index 57ad56348..5a91493ab 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
@@ -133,13 +133,22 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
 			return ExitStatus.FAILED.addExitDescription(e.getClass().getName() + ": " + e.getMessage());
 		}
 		finally {
+
+			if (logger.isDebugEnabled()) {
+				logger.debug("Finished waiting for results in step listener.  Still expecting: " + localState.getExpecting());
+			}
+
 			for (StepContribution contribution : getStepContributions()) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Applying:" + contribution);
+				}
 				stepExecution.apply(contribution);
 			}
 		}
 		if (timedOut) {
 			stepExecution.setStatus(BatchStatus.FAILED);
-			throw new ItemStreamException("Timed out waiting for back log at end of step");
+			return ExitStatus.FAILED.addExitDescription("Timed out waiting for " + localState.getExpecting()
+					+ " backlog at end of step");
 		}
 		return ExitStatus.COMPLETED.addExitDescription("Waited for " + expecting + " results.");
 	}
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java
index bed03939e..c8958831e 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java
@@ -42,7 +42,7 @@ public class MessageSourcePollerInterceptor extends ChannelInterceptorAdapter im
 	}
 
 	/**
-	 * Optional MessageChannel for injecting the message receieved from the source (defaults to the channel intercepted
+	 * Optional MessageChannel for injecting the message received from the source (defaults to the channel intercepted
 	 * in {@link #preReceive(MessageChannel)}).
 	 * 
 	 * @param channel the channel to set
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
index 42d24d3c5..6ff591fe6 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
@@ -180,7 +180,7 @@ public class RemoteChunkHandlerFactoryBean<T> implements FactoryBean<ChunkHandle
 	}
 
 	/**
-	 * Update a StepContribution with all the data from a StepContributionSource. The filter and write conuts plus the
+	 * Update a StepContribution with all the data from a StepContributionSource. The filter and write counts plus the
 	 * exit status will be updated to reflect the data in the source.
 	 * 
 	 * @param contribution the current contribution