Updates and typo fixes