- rewrite some of the message templates to be clearer