Updated cmake files. Fixed typos in main.cpp