Adding Cmake variables and typo corections