+fixed some bugs