Fixed Bugs :)