tentative commit
 modify some bugs