Log combat messages, plus a few tweaks