fixing bugs n shit