Comments and wording changes