changes for data cleanups and functionality improvements