fix bugs with sync being wonky