CS and typo fixes