[FIX] Fixed Bugs, all working! :)