Merge pull request #217 from futuresandwich/task/tweak_messages

tweaking messages