less crashes, better sync (again \!)