more fixes to save()