Fix typo and some minor fixes.