some more manual changes
cleanup and move to people manifest