fixes and syncs