Fixed stupid mistakes

Fixes mistakes pointed out to me.  If someone could go through and make sure I got them all, it would help.