More code formatting fixes and some typo fixes.