Tools and C++ Updates