Corrected constructor
Small changes do CMakeLists