port to C++ complete - more bugs to fix