review comments
Merge pull request #3001 from devoncarew/devoncarew_better_messaging2

review comments