just fixed some bugs