fix and some comments