Fixes for three of mrcoolbp's issues
Merge pull request #316 from TheMightyBuzzard/typos

Fixes for three of Bytram's issues