improvements based on feedback

Some forgotten messages changes