Made some advised amendments.