sync callbacks & bugfixes (in progress)