bunch of cleanup, styleguide fixes, and styleguide-diff fixes