Cleanups of dual files, and some small updates/sync