Fixing up some descriptions based on reviews.
Merge branch 'dev'