update fixed some bugs