a few more edits
Merge pull request #38 from janeskim/edits

a few more edits