Some fixes to how to data objects are saved
changes to configurations