Some more rereading, editing