Everything fixed, CMakeFiles updated