more fixes to save; more simplification of data handling