Sync complete implementation plus fixes