Address first round of review comments.