more cleanup of messages. I'm still trying to figure out to add text daisy, both 2 and 3.