REVIEW: fixes for first round of review notes