fixed some bugs
next version