Round of Edits 3

3rd round of edits (text, labels, etc)