slight improvent to messages