Merge pull request #222 from Useful-Innovation/johans-fixes

spellfix