After my feedback. Changed many small issues