Ability matching tweaks & bugfixes