Fixed More Bugs :D