Address some comments.