Support new savegame format, a bit simpler/better error handling