fixed some bugs :bugs: