Adding fixes to grading script