Fixed some bugs, prob made some more