1/fixed some bugs