Update wording; small style changes