Finishes ability modification adjustments

Nothing is ever really finished... so yeah that could change.
This also adds some new pending specs around stopping/starting criteria.