minor edits and corrections
Merge pull request #576 from abhinavc/master

minor edits and corrections