Setup get damage assessment

And other small changes and fixes.