diff --git a/OpticsTools.py b/OpticsTools.py
index c223d69..b696084 100644
--- a/OpticsTools.py
+++ b/OpticsTools.py
@@ -93,6 +93,7 @@ class OpticsTools(QtWidgets.QMainWindow, QtCore.QObject, Ui_OpticsGUI):
         #enfore the writing of a new lattice so that the magnet settings are in the new lattice
         self.model.forceLat = True
         self.plot.newData(twiss, energy)
+        self.model.checkMagnetLimit()
         if self.UISaveMatchSettings.isChecked():
             fileName = self.match.scriptdir+'/settings.json'
             self.saveSettingsdirect(fileName)
diff --git a/Scripts/Current/Reference-SwissFEL/matchAramis.madx b/Scripts/Current/Reference-SwissFEL/matchAramis.madx
index 0950c4c..7fde321 100644
--- a/Scripts/Current/Reference-SwissFEL/matchAramis.madx
+++ b/Scripts/Current/Reference-SwissFEL/matchAramis.madx
@@ -171,12 +171,13 @@ if (ECOLasBC ==0.) {
 ! reference point is sarma01-mqua010
 
 
-sarcl01.mqua020.k1 := 0.4550820417;
-sarcl01.mqua050.k1 := -0.02350776516;
-sarcl01.mqua080.k1 := -0.3705426893;
-sarcl01.mqua100.k1 := 0.3937186328;
-sarcl01.mqua140.k1 := 1.214406656;
-sarcl01.mqua190.k1 := -1.475278354;
+sarcl01.mqua020.k1 := -0.3109183657708632;
+sarcl01.mqua050.k1 := 1.1323860413233364;
+sarcl01.mqua080.k1 := -1.0592284165864374;
+sarcl01.mqua100.k1 := 0.4977126953750365;
+sarcl01.mqua140.k1 := 1.5888200788912714;
+sarcl01.mqua190.k1 := -1.4664371645567087;
+
 
 
 use,sequence=swissfel;
diff --git a/Scripts/Current/Reference-SwissFEL/matchAthos.madx b/Scripts/Current/Reference-SwissFEL/matchAthos.madx
index f07831e..29896ad 100644
--- a/Scripts/Current/Reference-SwissFEL/matchAthos.madx
+++ b/Scripts/Current/Reference-SwissFEL/matchAthos.madx
@@ -220,6 +220,13 @@ ENDMATCH;
 
 !------------------------------------
 ! match into SATCB01
+
+SATDI01.MQUA250.k1 = 0.5133752059615295;
+SATDI01.MQUA260.k1 = 0.020908544786374827;
+SATDI01.MQUA280.k1 = -0.1539748758300458;
+SATDI01.MQUA300.k1 = -0.4076917783767798;
+
+
 Print,text='MATCH POINT: Match into Athos C-Band Linac';
 MATCH, SEQUENCE=swissfel,range=s20sy02$start/satcl02$end,beta0=twisssep;
 VARY,NAME=satdi01.mqua250.k1,STEP=0.0001,lower=-1.8,upper=1.8;
@@ -329,6 +336,15 @@ CONSTRAINT,SEQUENCE=swissFEL,range=satma01.mqua180$start, bety <70;
 LMDIF,CALLS=1000,TOLERANCE=1.e-21;
 ENDMATCH;
 
+
+SATUN22.MQUA080.k1=0.3404465492390915;
+SATMA02.MQUA010.k1=-1.70059684406987;
+SATMA02.MQUA020.k1= -1.2555549595627236;
+SATMA02.MQUA040.k1=1.7512981454076746;
+SATMA02.MQUA050.k1=2.0583770289202374;
+SATMA02.MQUA070.k1=-2.53456088043864;
+
+
 Print,text='MATCH POINT: Match into Athos TCAV';
 MATCH, SEQUENCE=swissfel,range=s20sy02$start/satbd01$end,beta0=twisssep;
 VARY,NAME=satun22.mqua080.k1,STEP=0.0001,lower=-5.0,upper=5.0;
diff --git a/Scripts/Current/Reference-SwissFEL/matchInjector.madx b/Scripts/Current/Reference-SwissFEL/matchInjector.madx
index 0a8ea61..58b2698 100644
--- a/Scripts/Current/Reference-SwissFEL/matchInjector.madx
+++ b/Scripts/Current/Reference-SwissFEL/matchInjector.madx
@@ -84,7 +84,11 @@ plot,haxis=s,vaxis=betx,bety,colour=100;
 sinsb05.mqua130.k1 := sinsb04.mqua130.k1;
 sinsb05.mqua230.k1 := sinsb04.mqua230.k1;
 
-
+SINBC01.MQUA020.k1= -0.46904024313911785;
+SINBC01.MQUA050.k1= -0.18048692888559933;
+SINBC01.MQUA070.k1= 0.03866457210745946;
+SINBC01.MQUA090.k1= 0.21543435379513257;
+SINBC01.MQUA110.k1= 0.8008417564740974;
 
 Print,text='MATCH POINT: Match through BC1';
 MATCH,SEQUENCE=SwissFEL,range=#s/sindi02$end,beta0=twiss0;
@@ -95,14 +99,14 @@ VARY,NAME=sinbc01.mqua090.k1,STEP=0.0001,lower=-3.5,upper=3.5;
 VARY,NAME=sinbc01.mqua110.k1,STEP=0.0001,lower=-3.5,upper=3.5;
 VARY,NAME=sindi01.mqua020.k1,STEP=0.0001,lower=-3.5,upper=3.5;
 VARY,NAME=sindi01.mqua070.k1,STEP=0.0001,lower=-3.5,upper=3.5;
-
 CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc01.mqua110$end,betx<120;
 CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02.mbnd400,bety<100;
-CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02.mbnd400,betx<5.1;
+CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02.mbnd400,betx<3.1;
 CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,bety=TwissM2->BETY;
 CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,alfy=TwissM2->ALFY;
 CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,betx=TwissM2->BETX;
-CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,alfx=TwissM2->ALFY;
+CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,alfx=TwissM2->ALFX;
+SIMPLEX,CALLS=1000,TOLERANCE=1.e-21;
 LMDIF,CALLS=1000,TOLERANCE=1.e-21;
 ENDMATCH;
 
@@ -209,7 +213,11 @@ ENDMATCH;
 ! reference point s10ma01-mqua020
 
 
-
+S10BC01.MQUA020.k1= 2.1236457315221373;
+S10BC01.MQUA040.k1= -0.8332634315651051;
+S10BC01.MQUA060.k1= -1.7337532980446841;
+S10BC01.MQUA080.k1= 0.7800006260607678;
+S10BC01.MQUA100.k1= 1.0388756300422775;
 
 Print,text='MATCH POINT: Match through BC2';
 MATCH,SEQUENCE=SwissFEL,range=#s/s20cb01$start,beta0 = twiss0;
diff --git a/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx b/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx
index 13a840d..789e129 100644
--- a/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx
+++ b/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx
@@ -117,7 +117,7 @@ plot,haxis=s,vaxis=re56,range = s20sy02$start/satsy02$end,colour=100;
 
 ! was -1.2 and 1
 satcl011:=-1.3;
-satcl012:= 1.1;
+satcl012:= 1.0;
 satcl01.mqua120.k1:=satcl011;
 satcl01.mqua130.k1:=satcl012;
 satcl01.mqua180.k1:=satcl012;
diff --git a/Scripts/Current/Reference-SwissFEL/settings.json b/Scripts/Current/Reference-SwissFEL/settings.json
index bf91769..7c95828 100644
--- a/Scripts/Current/Reference-SwissFEL/settings.json
+++ b/Scripts/Current/Reference-SwissFEL/settings.json
@@ -69,40 +69,40 @@
             "k1L": -0.1793757940018433
         },
         "SINSB04.MQUA130": {
-            "k1": 0.7084748994661484,
-            "k1L": 0.10627123491992226
+            "k1": 0.7084748994661481,
+            "k1L": 0.1062712349199222
         },
         "SINSB04.MQUA230": {
-            "k1": -0.7081053976736004,
-            "k1L": -0.10621580965104005
+            "k1": -0.7081053976736001,
+            "k1L": -0.10621580965104002
         },
         "SINSB05.MQUA130": {
-            "k1": 0.7084748994661484,
-            "k1L": 0.10627123491992226
+            "k1": 0.7084748994661481,
+            "k1L": 0.1062712349199222
         },
         "SINSB05.MQUA230": {
-            "k1": -0.7081053976736004,
-            "k1L": -0.10621580965104005
+            "k1": -0.7081053976736001,
+            "k1L": -0.10621580965104002
         },
         "SINBC01.MQUA020": {
-            "k1": 0.034966,
-            "k1L": 0.005244899999999999
+            "k1": -0.4689108974355348,
+            "k1L": -0.07033663461533023
         },
         "SINBC01.MQUA050": {
-            "k1": 0.006852,
-            "k1L": 0.0010278
+            "k1": -0.17983570272412375,
+            "k1L": -0.026975355408618562
         },
         "SINBC01.MQUA070": {
-            "k1": 0.009148,
-            "k1L": 0.0013721999999999999
+            "k1": 0.03641346815970873,
+            "k1L": 0.005462020223956309
         },
         "SINBC01.MQUA090": {
-            "k1": 0.005371,
-            "k1L": 0.00080565
+            "k1": 0.21559563276913898,
+            "k1L": 0.03233934491537085
         },
         "SINBC01.MQUA110": {
-            "k1": 0.578802,
-            "k1L": 0.0868203
+            "k1": 0.8018032404499665,
+            "k1L": 0.12027048606749498
         },
         "SINBC02.MQSK110": {
             "k1": 0.0,
@@ -121,132 +121,132 @@
             "k1L": 0.0
         },
         "SINDI01.MQUA020": {
-            "k1": 0.053693,
-            "k1L": 0.008053949999999999
+            "k1": -1.0687840949218406,
+            "k1L": -0.1603176142382761
         },
         "SINDI01.MQSK030": {
             "k1": 0.0,
             "k1L": 0.0
         },
         "SINDI01.MQUA070": {
-            "k1": -0.147272,
-            "k1L": -0.022090799999999997
+            "k1": 0.9983411568442228,
+            "k1L": 0.14975117352663342
         },
         "SINDI02.MQUA020": {
-            "k1": -0.855200253107939,
-            "k1L": -0.12828003796619084
+            "k1": 0.41533137454297014,
+            "k1L": 0.06229970618144552
         },
         "SINDI02.MQUA030": {
-            "k1": -0.08287827833640135,
-            "k1L": -0.012431741750460202
+            "k1": -1.2027554169302084,
+            "k1L": -0.18041331253953125
         },
         "SINDI02.MQUA050": {
-            "k1": 2.1272271444855293,
-            "k1L": 0.3190840716728294
+            "k1": -0.5883818382440956,
+            "k1L": -0.08825727573661434
         },
         "SINDI02.MQUA060": {
-            "k1": -2.1843319443265963,
-            "k1L": -0.32764979164898944
+            "k1": 1.0923302410582127,
+            "k1L": 0.1638495361587319
         },
         "SINDI02.MQUA090": {
-            "k1": 1.9412845065192323,
-            "k1L": 0.29119267597788484
+            "k1": 1.470268971832158,
+            "k1L": 0.2205403457748237
         },
         "S10CB01.MQUA230": {
-            "k1": -0.9462399711346737,
-            "k1L": -0.14193599567020104
+            "k1": -1.1680211381232757,
+            "k1L": -0.17520317071849134
         },
         "S10CB01.MQUA430": {
-            "k1": 1.9632202193593487,
-            "k1L": 0.29448303290390226
+            "k1": 2.2970502580941266,
+            "k1L": 0.344557538714119
         },
         "S10CB02.MQUA230": {
-            "k1": -1.5169102297795853,
-            "k1L": -0.22753653446693778
+            "k1": -1.5169102297795856,
+            "k1L": -0.22753653446693783
         },
         "S10CB02.MQUA430": {
-            "k1": 1.5168434959109265,
-            "k1L": 0.22752652438663895
+            "k1": 1.516843495910926,
+            "k1L": 0.2275265243866389
         },
         "S10DI01.MQUA030": {
             "k1": 0.0,
             "k1L": 0.0
         },
         "S10DI01.MQUA120": {
-            "k1": -1.5169102297795853,
-            "k1L": -0.22753653446693778
+            "k1": -1.5169102297795856,
+            "k1L": -0.22753653446693783
         },
         "S10CB03.MQUA230": {
-            "k1": 1.5168434959109265,
-            "k1L": 0.22752652438663895
+            "k1": 1.516843495910926,
+            "k1L": 0.2275265243866389
         },
         "S10CB03.MQUA430": {
-            "k1": -1.5169102297795853,
-            "k1L": -0.22753653446693778
+            "k1": -1.5169102297795856,
+            "k1L": -0.22753653446693783
         },
         "S10CB04.MQUA230": {
-            "k1": 1.5168434959109265,
-            "k1L": 0.22752652438663895
+            "k1": 1.516843495910926,
+            "k1L": 0.2275265243866389
         },
         "S10CB04.MQUA430": {
-            "k1": -1.5169102297795853,
-            "k1L": -0.22753653446693778
+            "k1": -1.5169102297795856,
+            "k1L": -0.22753653446693783
         },
         "S10CB05.MQUA230": {
-            "k1": 1.5168434959109265,
-            "k1L": 0.22752652438663895
+            "k1": 1.516843495910926,
+            "k1L": 0.2275265243866389
         },
         "S10CB05.MQUA430": {
-            "k1": -1.5169102297795853,
-            "k1L": -0.22753653446693778
+            "k1": -1.5169102297795856,
+            "k1L": -0.22753653446693783
         },
         "S10CB06.MQUA230": {
-            "k1": 1.5168434959109265,
-            "k1L": 0.22752652438663895
+            "k1": 1.516843495910926,
+            "k1L": 0.2275265243866389
         },
         "S10CB06.MQUA430": {
-            "k1": -1.5169102297795853,
-            "k1L": -0.22753653446693778
+            "k1": -1.5169102297795856,
+            "k1L": -0.22753653446693783
         },
         "S10CB07.MQUA230": {
-            "k1": 1.5168434959109265,
-            "k1L": 0.22752652438663895
+            "k1": 1.516843495910926,
+            "k1L": 0.2275265243866389
         },
         "S10CB07.MQUA430": {
-            "k1": -1.5129774896990908,
-            "k1L": -0.2269466234548636
+            "k1": -1.5129774896983825,
+            "k1L": -0.22694662345475736
         },
         "S10CB08.MQUA230": {
-            "k1": 1.517944384602827,
-            "k1L": 0.22769165769042404
+            "k1": 1.5179443846027507,
+            "k1L": 0.2276916576904126
         },
         "S10CB08.MQUA430": {
-            "k1": -1.5096528272270517,
-            "k1L": -0.22644792408405776
+            "k1": -1.5096528272272363,
+            "k1L": -0.22644792408408543
         },
         "S10CB09.MQUA230": {
-            "k1": 1.5062716634436102,
-            "k1L": 0.22594074951654153
+            "k1": 1.5062716634440012,
+            "k1L": 0.22594074951660018
         },
         "S10BC01.MQUA020": {
-            "k1": 1.85173448401334,
-            "k1L": 0.277760172602001
+            "k1": 2.1236457459811415,
+            "k1L": 0.31854686189717124
         },
         "S10BC01.MQUA040": {
-            "k1": -0.7295011324336752,
-            "k1L": -0.10942516986505128
+            "k1": -0.8332634421052039,
+            "k1L": -0.12498951631578058
         },
         "S10BC01.MQUA060": {
-            "k1": -1.5784125730265695,
-            "k1L": -0.2367618859539854
+            "k1": -1.7337533006716508,
+            "k1L": -0.2600629951007476
         },
         "S10BC01.MQUA080": {
-            "k1": 0.1817690389691952,
-            "k1L": 0.02726535584537928
+            "k1": 0.7800006511784737,
+            "k1L": 0.11700009767677105
         },
         "S10BC01.MQUA100": {
-            "k1": 1.3963958292657253,
-            "k1L": 0.2094593743898588
+            "k1": 1.038875612694709,
+            "k1L": 0.15583134190420633
         },
         "S10BC02.MQSK110": {
             "k1": 0.0,
@@ -265,24 +265,24 @@
             "k1L": 0.0
         },
         "S10MA01.MQUA020": {
-            "k1": -0.9879023870679028,
-            "k1L": -0.1481853580601854
+            "k1": -0.7686677577731812,
+            "k1L": -0.11530016366597717
         },
         "S10MA01.MQUA050": {
-            "k1": -0.2955602713546331,
-            "k1L": -0.04433404070319496
+            "k1": -0.6718578235100604,
+            "k1L": -0.10077867352650906
         },
         "S10MA01.MQUA070": {
-            "k1": 0.597475935273834,
-            "k1L": 0.0896213902910751
+            "k1": 0.9712172534949088,
+            "k1L": 0.1456825880242363
         },
         "S10MA01.MQUA110": {
-            "k1": 1.1172009381553722,
-            "k1L": 0.16758014072330582
+            "k1": 0.7857978282130894,
+            "k1L": 0.1178696742319634
         },
         "S10MA01.MQUA130": {
-            "k1": -0.5024078715440069,
-            "k1L": -0.07536118073160103
+            "k1": -0.29847244736377654,
+            "k1L": -0.04477086710456648
         },
         "S20CB01.MQUA430": {
             "k1": -0.8635667730961264,
@@ -329,24 +329,24 @@
             "k1L": -0.18263923557583664
         },
         "S20SY03.MQUA020": {
-            "k1": 0.8592069608422452,
-            "k1L": 0.12888104412633677
+            "k1": 0.8592016943667193,
+            "k1L": 0.1288802541550079
         },
         "S20SY03.MQUA030": {
-            "k1": 0.6145394668201571,
-            "k1L": 0.09218092002302357
+            "k1": 0.6145489000262874,
+            "k1L": 0.0921823350039431
         },
         "S20SY03.MQUA050": {
-            "k1": -0.08130714629328406,
-            "k1L": -0.012196071943992609
+            "k1": -0.08131657881685135,
+            "k1L": -0.012197486822527703
         },
         "S20SY03.MQUA060": {
-            "k1": -1.2684668897196494,
-            "k1L": -0.1902700334579474
+            "k1": -1.268463537232424,
+            "k1L": -0.1902695305848636
         },
         "S20SY03.MQUA100": {
-            "k1": 0.42585555207159437,
-            "k1L": 0.06387833281073915
+            "k1": 0.42585350235555686,
+            "k1L": 0.06387802535333352
         },
         "S30CB01.MQUA430": {
             "k1": 0.8200899250742555,
@@ -369,20 +369,20 @@
             "k1L": 0.12301348876113832
         },
         "S30CB06.MQUA430": {
-            "k1": -0.8191461508459634,
-            "k1L": -0.1228719226268945
+            "k1": -0.8191461508460278,
+            "k1L": -0.12287192262690416
         },
         "S30CB07.MQUA430": {
-            "k1": 0.8194777493503408,
-            "k1L": 0.12292166240255112
+            "k1": 0.819477749350287,
+            "k1L": 0.12292166240254306
         },
         "S30CB08.MQUA430": {
-            "k1": -0.8180579224051848,
-            "k1L": -0.12270868836077772
+            "k1": -0.8180579224051746,
+            "k1L": -0.12270868836077618
         },
         "S30CB09.MQUA430": {
-            "k1": 0.818170034663627,
-            "k1L": 0.12272550519954405
+            "k1": 0.8181700346634088,
+            "k1L": 0.12272550519951131
         },
         "S30CB10.MQUA430": {
             "k1": -0.8200880145207072,
@@ -409,28 +409,28 @@
             "k1L": 0.12301348876113832
         },
         "SARCL01.MQUA020": {
-            "k1": -0.3109183657708632,
-            "k1L": -0.09327550973125895
+            "k1": -0.3109183657709005,
+            "k1L": -0.09327550973127015
         },
         "SARCL01.MQUA050": {
-            "k1": 1.1323860413233364,
-            "k1L": 0.33971581239700094
+            "k1": 1.1323860413238542,
+            "k1L": 0.33971581239715626
         },
         "SARCL01.MQUA080": {
-            "k1": -1.0592284165864374,
-            "k1L": -0.3177685249759312
+            "k1": -1.0592284165862196,
+            "k1L": -0.3177685249758659
         },
         "SARCL01.MQUA100": {
-            "k1": 0.4977126953750365,
-            "k1L": 0.14931380861251095
+            "k1": 0.4977126953746984,
+            "k1L": 0.14931380861240953
         },
         "SARCL01.MQUA140": {
-            "k1": 1.5888200788912714,
-            "k1L": 0.4766460236673814
+            "k1": 1.588820078891861,
+            "k1L": 0.47664602366755826
         },
         "SARCL01.MQUA190": {
-            "k1": -1.4664371645567087,
-            "k1L": -0.4399311493670126
+            "k1": -1.466437164559346,
+            "k1L": -0.43993114936780375
         },
         "SARCL02.MQUA130": {
             "k1": 2.470468387349568,
@@ -477,24 +477,24 @@
             "k1L": 0.7411405162048703
         },
         "SARMA01.MQUA010": {
-            "k1": -1.0864834489771846,
-            "k1L": -0.3259450346931554
+            "k1": -1.09711775491832,
+            "k1L": -0.329135326475496
         },
         "SARMA01.MQUA060": {
-            "k1": 1.6964569186924352,
-            "k1L": 0.5089370756077305
+            "k1": 1.6935845526005924,
+            "k1L": 0.5080753657801776
         },
         "SARMA01.MQUA080": {
-            "k1": -0.7264289912745869,
-            "k1L": -0.21792869738237608
+            "k1": -0.7057408883949718,
+            "k1L": -0.21172226651849155
         },
         "SARMA01.MQUA120": {
-            "k1": -0.35539330603516206,
-            "k1L": -0.10661799181054861
+            "k1": -0.3810533232656166,
+            "k1L": -0.11431599697968498
         },
         "SARMA01.MQUA140": {
-            "k1": 0.7749714418886964,
-            "k1L": 0.2324914325666089
+            "k1": 0.7812828564218556,
+            "k1L": 0.23438485692655667
         },
         "SARMA02.MQUA050": {
             "k1": -0.0,
@@ -641,40 +641,40 @@
             "k1L": -0.20064006970481765
         },
         "SATSY02.MQUA230": {
-            "k1": 0.80646508131005,
-            "k1L": 0.1209697621965075
+            "k1": 0.8064648841691082,
+            "k1L": 0.12096973262536623
         },
         "SATSY03.MQUA010": {
-            "k1": -0.6767219980657146,
-            "k1L": -0.1015082997098572
+            "k1": -0.6767220423360094,
+            "k1L": -0.10150830635040141
         },
         "SATSY03.MQUA040": {
-            "k1": 0.13543742238797846,
-            "k1L": 0.020315613358196767
+            "k1": 0.13543695355903906,
+            "k1L": 0.020315543033855857
         },
         "SATSY03.MQUA070": {
-            "k1": 0.6910400879940611,
-            "k1L": 0.10365601319910916
+            "k1": 0.6910400756555128,
+            "k1L": 0.10365601134832693
         },
         "SATSY03.MQUA100": {
-            "k1": 1.27839824320138,
-            "k1L": 0.191759736480207
+            "k1": 1.2783979998294552,
+            "k1L": 0.19175969997441827
         },
         "SATSY03.MQUA130": {
-            "k1": -1.6570170736362038,
-            "k1L": -0.24855256104543055
+            "k1": -1.6570172745935086,
+            "k1L": -0.24855259118902628
         },
         "SATCL01.MQUA120": {
-            "k1": -1.118726772197146,
-            "k1L": -0.1678090158295719
+            "k1": -1.1187267721997491,
+            "k1L": -0.16780901582996235
         },
         "SATCL01.MQSK125": {
             "k1": 0,
             "k1L": 0.0
         },
         "SATCL01.MQUA130": {
-            "k1": 1.7396886826914422,
-            "k1L": 0.26095330240371634
+            "k1": 1.7396886826913915,
+            "k1L": 0.26095330240370873
         },
         "SATCL01.MQUA180": {
             "k1": 1.7396881787706504,
@@ -685,36 +685,36 @@
             "k1L": -0.1678086648269995
         },
         "SATDI01.MQUA025": {
-            "k1": -1.0182230519177864,
-            "k1L": -0.15273345778766795
+            "k1": -1.0182231036993503,
+            "k1L": -0.15273346555490255
         },
         "SATDI01.MQUA080": {
-            "k1": 0.8831965025090273,
-            "k1L": 0.13247947537635407
+            "k1": 0.883196554405185,
+            "k1L": 0.13247948316077773
         },
         "SATDI01.MQUA220": {
-            "k1": 0.752777872599073,
-            "k1L": 0.11291668088986095
+            "k1": 0.7527772019438529,
+            "k1L": 0.11291658029157793
         },
         "SATDI01.MQUA230": {
-            "k1": -0.8913928981479108,
-            "k1L": -0.13370893472218662
+            "k1": -0.891392456763038,
+            "k1L": -0.1337088685144557
         },
         "SATDI01.MQUA250": {
-            "k1": 0.5133752059646293,
-            "k1L": 0.07700628089469438
+            "k1": 0.5133752059615295,
+            "k1L": 0.07700628089422942
         },
         "SATDI01.MQUA260": {
-            "k1": 0.020908544780951843,
-            "k1L": 0.0031362817171427765
+            "k1": 0.020908544786374827,
+            "k1L": 0.003136281717956224
         },
         "SATDI01.MQUA280": {
-            "k1": -0.15397487582922514,
-            "k1L": -0.023096231374383772
+            "k1": -0.1539748758300458,
+            "k1L": -0.02309623137450687
         },
         "SATDI01.MQUA300": {
-            "k1": -0.4076917783753463,
-            "k1L": -0.06115376675630194
+            "k1": -0.4076917783767798,
+            "k1L": -0.061153766756516965
         },
         "SATCB01.MQUA230": {
             "k1": 0.45565642715018484,
@@ -733,32 +733,32 @@
             "k1L": -0.06834846407258482
         },
         "SATMA01.MQUA050": {
-            "k1": 0.049188966252990914,
-            "k1L": 0.003935117300239273
+            "k1": 0.4960795150712536,
+            "k1L": 0.039686361205700287
         },
         "SATMA01.MQUA120": {
-            "k1": 1.3066481124057288,
-            "k1L": 0.1045318489924583
+            "k1": -0.4426967536894338,
+            "k1L": -0.0354157402951547
         },
         "SATMA01.MQUA140": {
-            "k1": -0.8456377216590887,
-            "k1L": -0.0676510177327271
+            "k1": 1.7333780352454218,
+            "k1L": 0.13867024281963375
         },
         "SATMA01.MQUA160": {
-            "k1": 1.204007851089999,
-            "k1L": 0.09632062808719992
+            "k1": -0.7081677560493832,
+            "k1L": -0.05665342048395066
         },
         "SATMA01.MQUA180": {
-            "k1": -2.76211946765235,
-            "k1L": -0.220969557412188
+            "k1": -1.8294510303905305,
+            "k1L": -0.14635608243124243
         },
         "SATMA01.MQUA230": {
-            "k1": -0.3024929322640702,
-            "k1L": -0.024199434581125615
+            "k1": -1.085685043804097,
+            "k1L": -0.08685480350432777
         },
         "SATMA01.MQUA250": {
-            "k1": 2.578019508570987,
-            "k1L": 0.20624156068567895
+            "k1": 2.998175816692189,
+            "k1L": 0.23985406533537512
         },
         "SATMA01.MQUA610": {
             "k1": -1.4163043129121315,
@@ -845,28 +845,28 @@
             "k1L": -0.30466611103290253
         },
         "SATUN22.MQUA080": {
-            "k1": 4.999997680293795,
-            "k1L": 0.39999981442350363
+            "k1": 0.3404465013858525,
+            "k1L": 0.027235720110868198
         },
         "SATMA02.MQUA010": {
-            "k1": -0.27122321273521066,
-            "k1L": -0.021697857018816852
+            "k1": -1.700596754064286,
+            "k1L": -0.13604774032514289
         },
         "SATMA02.MQUA020": {
-            "k1": -1.586646767863541,
-            "k1L": -0.12693174142908328
+            "k1": -1.2555549955098486,
+            "k1L": -0.10044439964078788
         },
         "SATMA02.MQUA040": {
-            "k1": -0.6249634311265162,
-            "k1L": -0.0499970744901213
+            "k1": 1.7512981509050953,
+            "k1L": 0.14010385207240764
         },
         "SATMA02.MQUA050": {
-            "k1": 3.450456194691823,
-            "k1L": 0.2760364955753459
+            "k1": 2.0583770262376855,
+            "k1L": 0.16467016209901483
         },
         "SATMA02.MQUA070": {
-            "k1": -1.9227629926181675,
-            "k1L": -0.1538210394094534
+            "k1": -2.5345608763808247,
+            "k1L": -0.20276487011046598
         },
         "SATBD01.MQUA010": {
             "k1": 0.5069789237265826,
@@ -893,7 +893,7 @@
             "k1L": 0.0
         },
         "SARBD02.MQUA030": {
-            "k1": 0,
+            "k1": 0.0,
             "k1L": 0.0
         },
         "SATBD02.MQUA030": {
diff --git a/model.py b/model.py
index 9bc9ee0..6e1609f 100644
--- a/model.py
+++ b/model.py
@@ -342,7 +342,6 @@ class Model:
             #k1 =  val/brho
 
         elements=self.getElements()
-        print('Relative Magnet Strength')
         for ele in elements:
             if 'MQUA' in ele.Name.upper():
                 bg = ele.Baugruppe
@@ -355,7 +354,7 @@ class Model:
                     k1max=k1brho[bg]/brho
                     rat=np.abs(ele.k1/k1max)*100.
                     label = '%s: %5.1f %%' % (ele.Name.replace('.','-'),rat)
-                    print(label)
+                    #print(label)
                     listitem = QtWidgets.QListWidgetItem(label)
                     color = QtGui.QColor(255,255,255)  # white
                     if rat>95: