Improve messaging

This is actually a modified commit from https://github.com/msabramo. The previous pull request was not mergeable because of other changes. I liked this though, so I am including the changes with another branch.