Some general editing