general tidying, plus updates to suit new composite editor