misc nits
Merge pull request #1618 from devoncarew/devoncarew_misc_nits

misc nits