grader updates. maybe still buggy