Grader fixes and results