+some comments, typo fix