added more checks to grader