Improvements to model saving code

[mmjb]

This combines a number of features around saving of models that I needed for an internal project.