Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
@@ -98,6 +98,9 @@
 	if (param.equals("edit")) {
 	    return edit(mapping, form, request, response);
 	}
+	if (param.equals("submitComments")) {
+	    return submitComments(mapping, form, request, response);
+	}
 	if (param.equals("submitHedging")) {
 	    return submitRankingHedging(mapping, form, request, response);
 	}
@@ -592,13 +595,67 @@
 	return startRating(mapping, form, request, response, service, sessionMap, toolSessionId, user, mode, criteria, next);
     }
     
+    /** 
+     * Submit any comments not already submitted and go back to the main learning screen.
+     */
     /**
      * Submit the ranking / hedging data and go back to the main learning screen.
      *
      * @throws IOException
      * @throws ServletException 
      *
      */
+    public ActionForward submitComments(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+
+	IPeerreviewService service = getPeerreviewService();
+
+	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
+		sessionMapID);
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	PeerreviewUser user = (PeerreviewUser) sessionMap.get(PeerreviewConstants.ATTR_USER);
+	Long toolSessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID);
+
+	Peerreview peerreview = service.getPeerreviewBySessionId(toolSessionId);
+
+	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
+	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+
+	if ( ! ( peerreview.getLockWhenFinished() && user.isSessionFinished() ) ) {
+
+	    Integer userId = user.getUserId().intValue();
+	    for (String key : request.getParameterMap().keySet()) {
+		if (key.startsWith("comment-textarea-")) {
+		    String itemIdString = key.substring(17);
+		    Long itemId = new Long(itemIdString);
+		    String comment = request.getParameter(key);
+		    if ( comment != null && comment.length() > 0 ) {
+			// save the comment to the database.
+			service.commentItem(criteria, userId, itemId, comment);
+		    }
+		}
+	    }
+	}
+	
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(PeerreviewConstants.PARAM_TOOL_SESSION_ID, toolSessionId);
+
+	Boolean next = WebUtil.readBooleanParam(request, "next");
+
+	// goto standard screen
+	return startRating(mapping, form, request, response, service, sessionMap, toolSessionId, user, mode, criteria, next);
+    }
+    /**
+     * Submit the ranking / hedging data and go back to the main learning screen.
+     *
+     * @throws IOException
+     * @throws ServletException 
+     *
+     */
     public ActionForward submitRankingHedging(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 
Index: lams_tool_preview/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r0a6765ac7eb73c6b99c343a021877c48236241b8 -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932
--- lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 0a6765ac7eb73c6b99c343a021877c48236241b8)
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
@@ -108,6 +108,13 @@
 			parameter="edit" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>	
+		<action path="/learning/submitComments"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
+			parameter="submitComments" >
+			<forward name="showResults" path="/learning/showResults.do" />	
+			<forward name="newReflection" path="/learning/newReflection.do" />	
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>	
 		<action path="/learning/submitHedging"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
 			parameter="submitHedging" >
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932
--- lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision d2f1cafab9126e3848663764c082b76ccf2de0c5)
+++ lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
@@ -94,7 +94,7 @@
 								rows += '<div class="no-gutter">';
 								rows += '';
 								rows += '<div class="col-xs-12 col-sm-11 ">';										
-								rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
+								rows +=		'<textarea name="comment-textarea-'+itemId+'" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 								rows += '</div>';
 								rows += 	'<div class="button add-comment add-comment-new col-xs-12 col-sm-1" data-item-id="'+ itemId +'" data-comment-criteria-id="${criteriaRatings.ratingCriteria.ratingCriteriaId}">';
 								rows += 	'</div>';
@@ -123,22 +123,37 @@
 		});
 	 });
 	
-	function submitEntry(next) {
-		// data saved by the tick boxes so don't use next button to submit
-		nextprev(next);
+
+	function submitEntry(next){
+		// ratings already saved, just save any unsaved comments.
+		hideButtons();
+		$("#next").val(next);
+		$('textarea').each(function() {
+			if (this.value==this.defaultValue)
+				this.value="";
+		});
+		$("#editForm").submit();
 	}
+
     </script>
 
-	<lams:TSTable numColumns="2">
-		<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
-			<fmt:message key="label.user.name" />
-		</th>
-		<th class="comment"> 
-			<fmt:message key="label.comment" />
-		</th>
-	</lams:TSTable>
-						
+	<form action="<c:url value="/learning/submitComments.do?"/>" method="get" id="editForm">
+		<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+		<input type="hidden" name="toolContentId" value="${toolContentId}"/>
+		<input type="hidden" name="criteriaId" value="${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>
+		<input type="hidden" name="next" id="next" value=""/>		
+
+		<lams:TSTable numColumns="2">
+			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
+				<fmt:message key="label.user.name" />
+			</th>
+			<th class="comment"> 
+				<fmt:message key="label.comment" />
+			</th>
+		</lams:TSTable>
+
+	</form>
+								
 	<div id="no-users-info">
 		<fmt:message key="label.no.users" />
 	</div>
-	
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
@@ -136,11 +136,14 @@
 										
 								//show comments textarea and a submit button
 								} else if (!isDisabled) {
-									rows += '<div id="add-comment-area-' + itemId + '">';	
+									rows += '<div id="add-comment-area-' + itemId;
+									if ( isCriteriaNotRatedByUser )
+										rows += '" style="visibility: hidden;';
+									rows += '">';	
 									rows += '<div class="no-gutter">';
 									rows += '';
 									rows += '<div class="col-xs-12 col-sm-11 ">';										
-									rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
+									rows +=		'<textarea name="comment-textarea-'+itemId+'" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 									rows += '</div>';
 									rows += 	'<div id="comment-tick-'+itemId+'" class="button add-comment add-comment-new col-xs-12 col-sm-1" ';
 									if ( isCriteriaNotRatedByUser )
@@ -173,11 +176,28 @@
 		});
 	 });
 	
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+	function submitEntry(next){
+		// ratings already saved, just save any unsaved comments.
+		hideButtons();
+		$("#next").val(next);
+		$('textarea').each(function() {
+			if (this.value==this.defaultValue)
+				this.value="";
+		});
+		$("#editForm").submit();
+	}
+</c:when>
+<c:otherwise>
 	function submitEntry(next) {
-		// data saved by the tick boxes so don't use next button to submit
+		// stars saved when clicked so don't use next button to submit
 		nextprev(next);
 	}
-	
+</c:otherwise>
+</c:choose>
+
 	function onRatingSuccessCallback() {
 		var numItems = $("#count-rated-items").html();
 		if ( ${minRates} <= 0 || numItems >=  ${minRates} ) {
@@ -224,6 +244,14 @@
 				
 			
 		</c:if>
+
+		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+		<form action="<c:url value="/learning/submitComments.do?"/>" method="get" id="editForm">
+			<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+			<input type="hidden" name="toolContentId" value="${toolContentId}"/>
+			<input type="hidden" name="criteriaId" value="${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>
+			<input type="hidden" name="next" id="next" value=""/>		
+		</c:if>
 				
 		<c:set var="numColumns" value="2"/>
 		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
@@ -243,6 +271,10 @@
 			</th>
 			</c:if>
 		</lams:TSTable>
+
+		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+		</form>
+		</c:if>
 							
 		<div id="no-users-info">
 			<fmt:message key="label.no.users" />