Updated the c++ models, and a few other things