Fixed some arena loading glitches

Handles hasAbility() MUCH better