Fix more of Peter's comments.