Many minor changes following plenary