fix some wording, clean up