Typo and bug fixes.