Fixed CMakeLists & added more to report