Updated GRADER. Cleaning up code.