messages updated and  fixed