CMake Changes

Both linux and commentary changes