Fix typo, improve comments