remainder of C++ cleanup & bump static lib