A few small changes here and there. Added some code in preparation for
changing Person CA logic.
March, my tiny army of green dots!