Fixed some new Bugs yay