some editing and additions