minor CMake changes, cleaner and with comments