Small fixes

Some fixes.
There is also the `player::has_martialart`function which does exactly what this loop does.