Fixed a few things. Most notably, the suggestions made with the last push.