some editing and a terminological change