made cmake file nicer and updated todo