Added CMakeLists.txt, minor changes to main