some bugs fixed
fix