Fixed Hitboxes, refactored lots of code