small improvements in C++ wrapper: