Major Update

FIX: Hitbox