Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r189a459a13057ddecbfa3db9e36e2a2b29bef5db -r2e1f773d727b87859ee3d782048f2c5e70443d0b
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 189a459a13057ddecbfa3db9e36e2a2b29bef5db)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2e1f773d727b87859ee3d782048f2c5e70443d0b)
@@ -81,9 +81,9 @@
 label.no.minimum  =No minimum
 label.no.maximum  =No maximum
 label.minimum.number.words  =Minimum number of words in a comment {0}
-warning.minimum.number.words  =There is a minimum required number of words in a comment: {0}. So far you've entered {1} word(s).
-label.comment.textarea.tip  =Please, provide some comment here...
-label.max.number.marks.each.user  =Max number of marks for a each user.
+warning.minimum.number.words  =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s).
+label.comment.textarea.tip  =Type your comment here then click on the green tick.
+label.max.number.marks.each.user  =Max number of reviews per user
 label.move.up  =Move Up
 label.move.down  =Move Down
 label.allow.comments  =Allow learners to comment on other learners
Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r189a459a13057ddecbfa3db9e36e2a2b29bef5db -r2e1f773d727b87859ee3d782048f2c5e70443d0b
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 189a459a13057ddecbfa3db9e36e2a2b29bef5db)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2e1f773d727b87859ee3d782048f2c5e70443d0b)
@@ -81,9 +81,9 @@
 label.no.minimum  =No minimum
 label.no.maximum  =No maximum
 label.minimum.number.words  =Minimum number of words in a comment {0}
-warning.minimum.number.words  =There is a minimum required number of words in a comment: {0}. So far you've entered {1} word(s).
-label.comment.textarea.tip  =Please, provide some comment here...
-label.max.number.marks.each.user  =Max number of marks for a each user.
+warning.minimum.number.words  =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s).
+label.comment.textarea.tip  =Type your comment here then click on the green tick.
+label.max.number.marks.each.user  =Max number of reviews per user.
 label.move.up  =Move Up
 label.move.down  =Move Down
 label.allow.comments  =Allow learners to comment on other learners
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r4c3cc4a8d4a35f05fd5d7c06072ff2a5c22f6260 -r2e1f773d727b87859ee3d782048f2c5e70443d0b
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 4c3cc4a8d4a35f05fd5d7c06072ff2a5c22f6260)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 2e1f773d727b87859ee3d782048f2c5e70443d0b)
@@ -76,6 +76,7 @@
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
 import org.lamsfoundation.lams.tool.peerreview.util.PeerreviewToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.tool.service.LamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -319,20 +320,25 @@
 	try {
 	    boolean wasNotInSetAlready = creatingUsersForSessionIds.add(toolSessionId);
 	    if (!wasNotInSetAlready) {
-		log.debug("Peer Review: Already processing session " + toolSessionId);
+//		log.debug("Peer Review: Already processing session " + toolSessionId);
 		return false;
 	    }
 
-	    log.debug("Peer Review: Processing session " + toolSessionId);
+//	    log.debug("Peer Review: Processing session " + toolSessionId);
 	    long start = System.currentTimeMillis();
 	    int usersAdded = 0;
 
 	    PeerreviewSession session = getPeerreviewSessionBySessionId(toolSessionId);
-	    Set<User> lessonUsers = toolService.getUsersFromGroupingActivity(toolSessionId);
+	    Integer numberPotentialLearners = toolService.getCountUsersForActivity(toolSessionId);
+//	    log.debug("Peer Review UserCreateThread " + toolSessionId + ": getCountUsersForActivity took: "
+//		    + (System.currentTimeMillis() - start) + "ms. numLearners "+numberPotentialLearners);
 	    List<Long> sessionUserIds = peerreviewUserDao.getUserIdsBySessionID(toolSessionId);
-	    boolean needsUpdate = sessionUserIds.size() != lessonUsers.size();
+//	    log.debug("Peer Review UserCreateThread " + toolSessionId + ": getUserIdsBySessionID took: "
+//		    + (System.currentTimeMillis() - start) + "ms.");
+	    boolean needsUpdate = sessionUserIds.size() != numberPotentialLearners.intValue();
 
 	    if (needsUpdate) {
+		Set<User> lessonUsers = toolService.getToolSession(toolSessionId).getLearners();
 		// create all new users
 		for (User lessonUser : lessonUsers) {
 		    currentUser = lessonUser;
@@ -343,8 +349,8 @@
 		}
 	    }
 
-	    log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: "
-		    + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded);
+//	    log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: "
+//		    + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded);
 	    creatingUsersForSessionIds.remove(toolSessionId);
 	    return true;
 	} catch (Throwable e) {
Index: lams_tool_preview/web/pages/learning/definelater.jsp
===================================================================
diff -u -r189a459a13057ddecbfa3db9e36e2a2b29bef5db -r2e1f773d727b87859ee3d782048f2c5e70443d0b
--- lams_tool_preview/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 189a459a13057ddecbfa3db9e36e2a2b29bef5db)
+++ lams_tool_preview/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 2e1f773d727b87859ee3d782048f2c5e70443d0b)
@@ -7,7 +7,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 		<c:choose>
-		<c:when test="${creatingUsers == 'true'}"><meta http-equiv="refresh" content="3"></c:when>
+		<c:when test="${creatingUsers == 'true'}"><meta http-equiv="refresh" content="2"></c:when>
 		<c:otherwise><meta http-equiv="refresh" content="60"></c:otherwise>
 		</c:choose>
 </lams:head>