Miscellaneous changes and cleanup.
Working on Personal Information round-trip data.