Tweaks

I originally did this last April, but there was a couple things that always bugged me about it, so I spent a couple hours fixing it up last week.