=fixed some bugs