fixed some typos added a few notes marked with XXX
Merge pull request #1 from rewolff/master

fixed some typos added a few notes marked with XXX