Some typo fixes and addons