Fixed a bunch of stuff for this milestone. Remaining stuff is checkstyle differences.
Fixed some more things for M10.