Correcting misc edits that have built up over the last few days
Merge pull request #4 from hamsternz/master

merge changes from hammy