Refinements and additions to S3 issue (PE-2906), and some copy edits.