Added more and clearer messages