Improve cmake project, small experiments