update message formatting and classes