sync and bug fix