lots of minor edits
Merge pull request #1 from pkra/master

lots of minor edits