Fix typo and small changes