Save/Load bug fixed, and choice lists in table updated