improved the messages