More robust versioning in CMake, plus comments