Minor changes and typo fixes