lots of data object cleanups
Merge local changes to repo