Made more changes from review