sync improvements
fix #104