fixing a number of syncing issues