Fix typo and so on