Small changes and typo fixing