Yet more damage changes

And believe me, there's a lot more to come...