Merge pull request #23 from ns-uw/master

Updates to some wording.