adjust
fix some bugs