Fix whitespace, typo, and fix startup code.