cleaning up CMakeLists.txt
fixing demos