fix some bugs :)