C++ Fixes, though still not 100% yet.