minor redesign of messages