change the file name and fix some bugs