Bigfixes, formatting, and comments. Oh, my!