did some more messages changes