Fix bugs n Stuff