added a little more message formatting