More corrections from review feedback.