more fixes to save