a few wording changes for consistency