21 combat fix

See commit messages.