adjust some bugs
adjust