bz bug sync functions & refactors