Typos + more consistent words

I've fixed some typos and changed some words to be more consistent.
Merge pull request #3 from lgoudriaan/master

Typos + more consistent words