some corrections on last submit.