Grader (most likely) final version and some fixes