Small changes and typo fixes