More consistency changes + making sure editing a person works again (but WIP)