Overall sexiness enhancements.

I'm the worst at commit messages.