More typo and bug fixes.