fixed a bunch of bugs around save and update and field mappings