Some typo fixes and minor improvements