email export of data and sync fixes
merge