Updated grader with more checks