Fix a few typos and consistency errors
Merge pull request #3 from remiprev/fix/typos

Fix a few typos and consistency errors