Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -rffbd31e92ef761df70dfa660de414ba7b8b269ce -r5ea7ebf8f81afa191dd6d761db613896ad530b4d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ffbd31e92ef761df70dfa660de414ba7b8b269ce)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
@@ -1219,7 +1219,7 @@
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());	    
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_ESSAY)) {
-	    question.setFeedback(questionForm.getFeedback());
+	    
 	} else if (type == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r596580465b9d0c2c7c50f9a1c42ca4ce6a91b523 -r5ea7ebf8f81afa191dd6d761db613896ad530b4d
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 596580465b9d0c2c7c50f9a1c42ca4ce6a91b523)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
@@ -51,7 +51,6 @@
      			    submitHandler: function(form) {
 		    			$("#question").val(FCKeditorAPI.GetInstance("question").GetXHTML());
 		    			$("#generalFeedback").val(FCKeditorAPI.GetInstance("generalFeedback").GetXHTML());
-		    			$("#feedback").val(FCKeditorAPI.GetInstance("feedback").GetXHTML());
 	     			    
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#questionListArea'), 
@@ -115,13 +114,6 @@
 				<lams:FCKEditor id="generalFeedback" value="${formBean.generalFeedback}"
 					contentFolderID="${formBean.contentFolderID}" width="622px">
 				</lams:FCKEditor>				
-				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.feedback" />
-				</div>
-				<lams:FCKEditor id="feedback" value="${formBean.feedback}"
-					contentFolderID="${formBean.contentFolderID}" width="622px">
-				</lams:FCKEditor>				
 
 			</html:form>
 
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r72100e7842f4ba7a26156d51d620235e5af78d5b -r5ea7ebf8f81afa191dd6d761db613896ad530b4d
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
@@ -50,7 +50,7 @@
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
-	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
+	    			    		return ($("select[name^='optionGrade'][value='1.0']").length < 1) && !eval($("#multipleAnswersAllowed").val());
 			    		    }			    		    
 	    			    }
 		    		},
@@ -173,7 +173,7 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.choice.one.multiple.answers" />
 				</div>
-				<html:select property="multipleAnswersAllowed">
+				<html:select property="multipleAnswersAllowed" styleId="multipleAnswersAllowed">
 					<html:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></html:option>
 					<html:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></html:option>
 				</html:select>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r72100e7842f4ba7a26156d51d620235e5af78d5b -r5ea7ebf8f81afa191dd6d761db613896ad530b4d
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
@@ -56,13 +56,24 @@
 		    			},
 		    			hasOptionFilled: {
 		    				required: function(element) {
-		    		        	return $("input[name^=optionFloat]:filled").length < 1;
+		    		        	return $("input[name^=optionFloat][value!='0.0']").length < 1;
 			    		    }			    		    
 	    			    },
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
 	    			    		return $("select[name^='optionGrade'][value='1.0']").length < 1;
 			    		    }			    		    
+	    			    },
+	    			    allAcceptedErrorsPositive: {
+		    				required: function(element) {
+		    					var count = 0;
+		    					$("input[name^=optionAcceptedError]").each(function(){
+			    					if (eval(this.value) < 0) {
+				    					count++;
+			    					}
+		    					});
+	    		        		return  count > 0;
+			    		    }			    		    
 	    			    },	    			    
 		    			unitList: {
 		    				required: function(element) {
@@ -90,7 +101,10 @@
 		    			},
 		    			hasOneHundredGrade: {
 		    				required: "<br><fmt:message key='error.form.validation.hundred.score'/>"
-		    			},		 
+		    			},		
+		    			allAcceptedErrorsPositive: {
+		    				required: "<br><fmt:message key='error.form.validation.positive.accepted.errors'/>"
+		    			}, 
 		    			unitList: {
 		    				required: ""
 		    			},
@@ -207,6 +221,7 @@
 				</div>
 				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
 				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
+				<input type="hidden" name="allAcceptedErrorsPositive" id="allAcceptedErrorsPositive">
 			</html:form>
 			
 			<!-- Options -->