Fix wording and CS