Change a couple of messages
mostly cosmetics