Revert "Revert "Fixed Alot Of Fucking Bugs!""

This reverts commit 740c21be60dd1978ae13216e85bc7c584d6611b3.