Updates based on comments to 8/15.