CMake config file cleanup.
Ensured that count out parameter is always set.
Comment fixes.