fixing bugs n stuff