New synch engine + bugfixes

New synch engine logic and various bug fixes