Combat tweaks! Seems better now.