updates and small typo fixes
Merge pull request #509 from ffrensch/master

updates and small typo fixes