Experimenting with person model, plus bug fixes