Second round of comments - looking good