Remove Ailment Added + Tweaks and fixes

Tweaks and fixes