Use the new private save_file so that we don't end up with two files each containing half the information
Various changes, new pairs
Small fixes