numerous fixes to medic class