C++ intro tweaks