fix some bugs
commit again