some bugs fixed
some fixed bugs