some corrections/suggestions
Merge pull request #2 from berlintam/corrections

some corrections/suggestions