Update to CMake, tweaks & dds