Minor improvements and typo fixes