Address Peter's other comments.
Various changes in response to comments.