minor improv to messages