Update
latest changes. C++ namespaces, scratch buffers, etc.