Auto-sync on changing settings, sync improvements