Added date of death persistence and form control, and fixed some things.