Updated CMakeLists.txt and made fixes per Adolfo