Improvements and typo fixes