Fixing bugs in xsync-cons; not working yet. But getting closer...