1) Athos branch os not fully saved in settings

2) sextupole matching for Reference file

3) SOlve match problems with leaked dispersion