cmakefile changes, result fixes
solved merge conflicts