Fix most of Peter's comments.