some bugs is fixed