Improved all messages.  finishes #47853987