copy edits
Merge pull request #504 from mbren/dev

copy edits