Combat formula tweaks

And other subtle changes