small fix, add some comments