Finish porting Person state objects, bug fixes