adjust some methods name and fix some bugs