optimizations and sync conflict updates, and additions to mobiledeviceaccess