fixed some bugs

asdf