Tweaked statuses and ability generation

Amended issue #262 to move the change to team generation into another pull request.