Fix hitboxes

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