Minor (hopefully uncontroversial) changes and additions