clean up sync logic
tweak extension sync timing
tweak extension sync timing pt 2