Modified many files after receiving feedbacks.