Small changes to Person5
Merges files