adjust some bugs