4-2 fix some bugs