fixes #7 and some typos