C++ all the way.
Improve log messages.