TODO bump
fix CMake leftover oddities