Typo fixes and improvements