fix some bugs and add coments