Handled more skills more correctly, untested.