fixed some bugs n such