better sync for peers
Merge pull request #102 from matiu/feature/ux8

better sync for peers