A number of additions based on comments.