Fixed some small things @mgold commented on.