refactored sync status to handle fixes
28 files changed