Better syncing

Fixed service being killed (is now restarted when watch requests sync).
More reliable syncing (fails less often when restarted in the middle of
it)