diff --git a/src/org/rascalmpl/courses/globals.js b/src/org/rascalmpl/courses/globals.js
index eb1daa6e661..3d489c728fa 100644
--- a/src/org/rascalmpl/courses/globals.js
+++ b/src/org/rascalmpl/courses/globals.js
@@ -8,5 +8,5 @@
 // enableQuestions | true     | true    | false    |
 
 
-var enableEditing = false;
+var enableEditing = true;
 var enableQuestions = true;
diff --git a/src/org/rascalmpl/tutor/ExamManager.rsc b/src/org/rascalmpl/tutor/ExamManager.rsc
index 190aa484bf2..d02ffb66d47 100644
--- a/src/org/rascalmpl/tutor/ExamManager.rsc
+++ b/src/org/rascalmpl/tutor/ExamManager.rsc
@@ -173,7 +173,7 @@ void createReview(){
 
 public set[examResult] update(str cn){
   scores = readSubmissionsAgain(cn);
-  reviews = readCSV(#set[reviewType], (resultsDir) + "Review.csv", ("separator" : ","));
+  reviews = readCSV(#set[reviewType], (resultsDir) + "Review.csv", ("separator" : ";"));
   println("reviews = <typeOf(reviews)>: <reviews>");
   
   rel[str Question, str Expected]good = readCSV(#rel[str Question, str Expected], (resultsDir) + "GoodAnswers.csv", ("separator" : ";"));
@@ -195,7 +195,11 @@ public set[examResult] update(str cn){
 	                points[q] = review.Score;
 	                comments[q] = review.Comment;
 	             }
-	             score = score + (points[q]?0.0);
+	             
+	             if (q in points) {
+	               score = score + points[q];
+	             } 
+	             
 	          }
 	          append examResult(sc.studentName, sc.studentMail, sc.StudentNumber, sc.timestamp, 
                                 sc.answers, sc.expectedAnswers, comments, points, 10.0 * score / nquestions);