few final changes to messages