fixes and clarifications
Merge pull request #1 from andyhammar/patch-1

fixes and clarifications