Overnight changes and cosmetic fixes.

Because I cant push or make pull requests unless it is my repository.