Fixed a number of small nitpicky items I missed :)