Grading, formatting tweaks and things