improvements to sync