Updated grader, checks, output