Changed some file names, fixed peopleByPersonId problem, adjusted page numbering