more C++ fixes, it looks like it's finished\!