Updates and typo corrections