bug fix: add some comments