Fix hitboxes

Okay so these are JUST the hitbox fixes from IceDreamers hitbox fixes patch.