Enhance / fix sync

[tobiasKaminsky]

• check bugs
• fix, if possible
• come up with better solutions, if needed

[i2h3]

This issue needs an explicit scope or will never be "done" (like every software 😁).