Small corrections/ modified cmakelist