Fixes #8 plus some typo fixes ;)