Some rereading, editing