CR: Minor comments.