misc changes
Merge pull request #2246 from devoncarew/devoncarew_misc_changes

misc changes