some bugs fixed
Some bugs fixed