diff --git a/final/EU/CHE/LSGG.txt b/final/EU/CHE/LSGG.txt
index 377754f..1eb0cbb 100644
--- a/final/EU/CHE/LSGG.txt
+++ b/final/EU/CHE/LSGG.txt
@@ -30,51 +30,51 @@ beacons =
 	PAS, N46.16369, E5.99992, -224, Passeiry #vordme 116.60 113x
 	GLA, N46.40869, E6.24425, 0, Gland #ndb 375
 	SPR, N46.46869, E6.44806, 224, St-Prex #vordme 113.90 86x
-	CBY, NN45.88189, E5.75731, 27, Chambery #vordme 115.40
+	CBY, N45.88189, E5.75731, 27, Chambery #vordme 115.40
 	SIO, N46.21550, E7.28878, 0, Sion #vordme 112.15
-	LSE, NN45.74553, E5.09058, 0, Lyon/Saint Exupery #vordme 114.75
-	LTP, NN45.48897, E5.43906, 0, La Tour Du Pin #vordme 115.55
+	LSE, N45.74553, E5.09058, 0, Lyon/Saint Exupery #vordme 114.75
+	LTP, N45.48897, E5.43906, 0, La Tour Du Pin #vordme 115.55
 	FRI, N46.77758, E7.22350, 0, Fribourg #vordme 110.85
 #SID ####################
 	ARBOS, N46.98742, E6.02639, 0, Arbos
-	ARGIS, NN45.97100, E5.59908, 0, Argis
-	BALSI, NN45.47739, E5.96078, 0, Balsi
-	BELUS, NN45.67519, E5.59381, 0, Belus 
-	BEVEN, NN45.68847, E5.97272, 0, Beven
-	DEPUL, NN45.92500, E5.49444, 0, Depul
+	ARGIS, N45.97100, E5.59908, 0, Argis
+	BALSI, N45.47739, E5.96078, 0, Balsi
+	BELUS, N45.67519, E5.59381, 0, Belus 
+	BEVEN, N45.68847, E5.97272, 0, Beven
+	DEPUL, N45.92500, E5.49444, 0, Depul
 	DIPIR, N46.66919, E5.59308, 0, Dipir
 	DJL,   N47.27078, E5.09733, 0, Dijon
 	GG602, N46.11633, E6.06717, 0
 	GG603, N46.26861, E6.05778, 0
 	GG604, N46.20186, E6.30875, 0
-	GG605, NN45.97589, E6.29164, 0
+	GG605, N45.97589, E6.29164, 0
 	KELUK, N46.55556, E5.68556, 0, Keluk
 	KEMIT, N46.13706, E5.96161, 0, Kemit
 	KOVIM, N46.61461, E6.20633, 0, Kovim
 	LEGVO, N46.66792, E6.28556, 0, Legvo
-	LINNA, NN45.81714, E5.98003, 0, Linna
-	MEDAM, NN45.26444, E6.94003, 0, Medam
-	ODIKI, NN45.94228, E6.34360, 0, Odiki
-	VANAS, NN45.45717, E6.74689, 0, Vanas
+	LINNA, N45.81714, E5.98003, 0, Linna
+	MEDAM, N45.26444, E6.94003, 0, Medam
+	ODIKI, N45.94228, E6.34360, 0, Odiki
+	VANAS, N45.45717, E6.74689, 0, Vanas
 #STAR
 	AKITO, N47.21334, E6.64875, 0, Akito
 	BELKA, N46.06114, E5.85058, 0, Belka
 	BOLGI, N46.66769, E5.93822, 0, Bolgi
-	GG502, NN45.95383, E5.89906, 0
+	GG502, N45.95383, E5.89906, 0
 	GG503, N46.09572, E5.69688, 0
 	GG507, N46.44086, E6.19989, 0
-	GG510, NN45.77300, E5.80294, 0
+	GG510, N45.77300, E5.80294, 0
 	GG512, N46.39717, E6.54903, 0
 	GG514, N46.54019, E6.34692, 0
 	GG517, N46.93967, E5.43947, 0
 	GG518, N46.90714, E6.24897, 0
-	GG519, NN45.52736, E6.70203, 0
-	GG520, NN45.95636, E6.76828, 0
+	GG519, N45.52736, E6.70203, 0
+	GG520, N45.95636, E6.76828, 0
 	GG525, N46.29819, E6.40222, 0
 	INDIS, N46.02444, E5.79700, 0, Indis
 	KERAD, N46.23531, E5.89931, 0, Kerad
 	KINES, N46.33136, E6.75531, 0, Kines
-	PINOT, NN45.98544, E5.92597, 0, Pinot
+	PINOT, N45.98544, E5.92597, 0, Pinot
 	PITOM, N46.09472, E6.10194, 0, Pitom
 	ROMOM, N46.68119, E6.97053, 0, Romom
 	SAUNI, N46.62369, E5.47769, 0, Sauni
@@ -91,32 +91,46 @@ beacons =
 # when holdingheading is negative, planes will make left-hand turns instead of right-hand
 
 boundary = 
+#tma4.1
 	N46.50031, E5.58632
 	N46.50131, E5.89028
 	N46.57467, E6.10541
+#tma4
 	N46.76794, E6.44169
+#tma5
 	N46.67621, E6.75053
 	N46.65868, E6.75206
 	N46.54613, E6.89952
 	N46.46916, E6.80134
+#tma6
 	N46.43143, E6.80296
 	N46.42703, E6.82070
 	N46.39257, E6.80367
+#tma7
 	N46.32079, E6.80581
 	N46.25736, E6.85272
 	N46.07779, E6.47823
 	N45.87433, E6.27316
 	N45.93139, E6.18299
+#tma8
+#tma9
 	N45.84271, E6.10006
+#tma10
 	N45.62078, E6.08624
 	N45.68588, E5.49736
 	N45.71675, E5.48792
+#tma9
+#tma8
 	N45.92996, E5.66084
+#tma2
 	N45.97664, E5.59866
 	N46.04364, E5.56927
 	N46.11139, E5.58505
 	N46.17281, E5.65549
+#tma3
 	N46.24426, E5.79840
+#tma4
+#tma4.1
 	
 ## positions
 # pointlist of optional airspace boundary polygon; this will override the default (circular) airspace radius.
@@ -151,24 +165,24 @@ line3 =
 	N46.20460, E6.13330
 	N46.12261, E5.90220
 	N46.01332, E5.81446
-	NN45.84948, E5.79306
-	NN45.73711, E5.74697
-	NN45.67618, E5.67627
-	NN45.70429, E5.57292
-	NN45.82139, E5.43701
-	NN45.84671, E5.34978
-	NN45.81227, E5.28519
-	NN45.79894, E5.19103
-	NN45.81738, E5.05843
-	NN45.80806, E4.95177
-	NN45.77095, E4.87095
-	NN45.71253, E4.82351
-	NN45.63280, E4.80945
-	NN45.58213, E4.81932
-	NN45.56053, E4.85312
-	NN45.51278, E4.84139
-	NN45.43896, E4.78403
-	NN45.28892, E4.78971
+	N45.84948, E5.79306
+	N45.73711, E5.74697
+	N45.67618, E5.67627
+	N45.70429, E5.57292
+	N45.82139, E5.43701
+	N45.84671, E5.34978
+	N45.81227, E5.28519
+	N45.79894, E5.19103
+	N45.81738, E5.05843
+	N45.80806, E4.95177
+	N45.77095, E4.87095
+	N45.71253, E4.82351
+	N45.63280, E4.80945
+	N45.58213, E4.81932
+	N45.56053, E4.85312
+	N45.51278, E4.84139
+	N45.43896, E4.78403
+	N45.28892, E4.78971
 
 line4 =
 	N46.32658, E7.65290
@@ -183,7 +197,7 @@ name = Geneva Cointrin International Airport
 code = LSGG
 runways =
 #   idnt,rwy,location           ,HDG  ,legnth,displaced,elev ,g/s, loc 
-	rwy1, 04, N46.2258, E6.09092, N45.5, 12795, 1082,  0, 1411,  3, N45.5,
+	rwy1, 04, N46.2258, E6.09092, 45.5, 12795, 1082,  0, 1411,  3, 45.5,
 
 climbaltitude = 9000 		; maximum initial climb altitude in feet for departures