A few more typo fixes and improvements