Fix details after 1st feedbacks