Improve vaccinator elements; a few unfixable bugs remain.