some bugs fixed
some bug fixed