fixed some bugs
yes