Add some comments, correct a typo