more changes from review