More fixes

- Charges now deplete correctly if the defib was used but failed
- All notices minus suicide notice changed to span