add and fix some comments