Address Randy's and NJ's review comments.