forgot to undo_save() in a few places -- fix it