added personboxes and cleaned some stuff up
fixed merge conflicts hopefully?
notes in readme
merge conflicts