- fixed some bugs