undo noisy sync stuff, fix bad string compare leading to disastrous sync