Messages

More changes to messages, still not 100%