some bugs resolved