diff --git a/airports.csv b/airports.csv
index d7da0ca0d..bb6de7a35 100644
--- a/airports.csv
+++ b/airports.csv
@@ -22454,7 +22454,7 @@
 323970,"EBLY","heliport","Lymar Heliport",51.210662,4.576811,33,"EU","BE","BE-VAN","Ranst","no","EBLY",,,,,
 29040,"EBLZ","closed","Zaffelare Heliport",51.130384,3.864098,26,"EU","BE","BE-VOV","Lochristi","no",,,,,,"EBLZ, Saffelaere"
 43729,"EBMA","closed","Westmalle Heliport",51.287224,4.714167,88,"EU","BE","BE-VAN","Malle","no",,,,,,"EBMA"
-308575,"EBMB","small_airport","Melsbroek Air Base",50.901389,4.484444,184,"EU","BE","BE-VBR","Steenokkerzeel","no","EBMB",,,"http://www.opendoor15w.be/","https://en.wikipedia.org/wiki/Melsbroek_Air_Base",
+308575,"EBMB","small_airport","Melsbroek Air Base",50.913419,4.491005,184,"EU","BE","BE-VBR","Steenokkerzeel","no","EBMB",,,"http://www.opendoor15w.be/","https://en.wikipedia.org/wiki/Melsbroek_Air_Base",
 43720,"EBMD","heliport","ZNA Middelheim Hospital Heliport",51.181674,4.421096,46,"EU","BE","BE-VAN","Antwerp","no","EBMD",,,,,
 43731,"EBME","heliport","Meerbeek Heliport",50.873724,4.596911,214,"EU","BE","BE-VBR","Meerbeek","no","EBME",,,,,
 30974,"EBMG","small_airport","Matagne-la-Petite Ultralight Airfield",50.104208,4.636063,787,"EU","BE","BE-WNA","Doische","no","EBMG",,,,,"Matagne, Matagne-la-Petite Ulmodrome"
@@ -45976,7 +45976,7 @@
 319583,"MX-0252","closed","Aeródromo Tecuixiapan",17.97788,-99.38776,2440,"NA","MX","MX-GRO","Tepecoacuilco de Trujano","no",,,,,,"FIL"
 319584,"MX-0253","small_airport","Aeródromo Las Bodas",17.266492,-100.962607,54,"NA","MX","MX-GRO","Tecpan de Galeana","no",,,"BDA",,,
 319585,"MX-0254","small_airport","Aeródromo de Taxco",18.573098,-99.595683,6265,"NA","MX","MX-GRO","Taxco de Alarcón","no",,,"TXC",,,
-319588,"MX-0255","small_airport","Aeródromo Atoyac",17.219413,-100.447935,205,"NA","MX","MX-GRO","Atoyac de Alvarez","no",,,"ATY",,,
+319588,"MX-0255","small_airport","Atoyac Airstrip",17.219413,-100.447935,205,"NA","MX","MX-GRO","Atoyac de Alvarez","no",,,"ATY",,,"Aeródromo Atoyac"
 319589,"MX-0256","closed","Aeródromo Arcelia",18.2979,-100.289,1375,"NA","MX","MX-GRO","Arcelia","no",,,,,,"MX05, ARC"
 319653,"MX-0257","small_airport","El Pinocho Airport",19.47655,-100.4332,6265,"NA","MX","MX-MIC","Zitácuaro","no",,,"PIO",,"https://es.wikipedia.org/wiki/Aer%C3%B3dromo_de_Zit%C3%A1cuaro_Miguel_Carrillo_Ayala",
 319678,"MX-0258","small_airport","Farías Airport",19.165125,-102.856476,1243,"NA","MX","MX-MIC","Tepalcatepec","no",,,"JFV",,,
@@ -51583,7 +51583,7 @@
 16163,"PAAN","small_airport","Gold King Creek Airport",64.198328,-147.929492,1720,"NA","US","US-AK","Fairbanks","no","PAAN",,"AK7",,"https://en.wikipedia.org/wiki/Gold_King_Creek_Airport","AK32"
 16094,"PAAP","seaplane_base","Port Alexander Seaplane Base",56.246799,-134.647995,,"NA","US","US-AK","Port Alexander","yes","PAAP","PTD","AHP",,"https://en.wikipedia.org/wiki/Port_Alexander_Seaplane_Base","AK15"
 5336,"PAAQ","medium_airport","Warren ""Bud"" Woods Palmer Municipal Airport",61.594898,-149.08901,242,"NA","US","US-AK","Palmer","no","PAAQ","PAQ","PAQ",,"https://en.wikipedia.org/wiki/Palmer_Municipal_Airport","Palmer Muni, Palmer Buddy Woods Municipal"
-16386,"PAAT","small_airport","Casco Cove Coast Guard Station",52.829797,173.173796,40,"NA","US","US-AK","Attu","no",,,,,"https://en.wikipedia.org/wiki/Casco_Cove_Coast_Guard_Station","PAAT, ATU"
+16386,"PAAT","small_airport","Casco Cove Coast Guard Station",52.829797,173.173796,40,"NA","US","US-AK","Attu","no","PAAT","ATU","ATU",,"https://en.wikipedia.org/wiki/Casco_Cove_Coast_Guard_Station",
 5337,"PABA","medium_airport","Barter Island Long Range Radar Station Airport",70.134003,-143.582001,2,"NA","US","US-AK","Barter Island","yes","PABA","BTI","BTI",,"https://en.wikipedia.org/wiki/Barter_Island_LRRS_Airport",
 5338,"PABE","medium_airport","Bethel Airport",60.77980042,-161.8379974,126,"NA","US","US-AK","Bethel","yes","PABE","BET","BET",,"https://en.wikipedia.org/wiki/Bethel_Airport",
 16501,"PABG","small_airport","Beluga Airport",61.1721992493,-151.044006348,130,"NA","US","US-AK","Beluga","no","PABG","BVU","BLG",,"https://en.wikipedia.org/wiki/Beluga_Airport",
@@ -57935,7 +57935,7 @@
 339980,"SG-0004","closed","Kallang Airport",1.307411,103.873378,,"AS","SG","SG-01","Kallang","no",,,,,"https://en.wikipedia.org/wiki/Kallang_Airport",
 351987,"SG-0005","small_airport","Murai Airfield",1.39203,103.69951,72,"AS","SG","SG-03","Western Water Catchment","no",,,,,,
 5508,"SG67","small_airport","Aeródromo de la Estancia Pai Quara",-23.229702,-55.948455,712,"SA","PY","PY-13","Estancia Pai Quara","no","SG67",,"SG67",,,
-6088,"SGAS","large_airport","Aeropuerto Internacional Silvio Pettirossi",-25.240156,-57.519227,292,"SA","PY","PY-11","Asunción","yes","SGAS","ASU",,,"https://en.wikipedia.org/wiki/Silvio_Pettirossi_International_Airport","Luque, Stroessner"
+6088,"SGAS","large_airport","Silvio Pettirossi International Airport.",-25.240156,-57.519227,292,"SA","PY","PY-11","Asunción","yes","SGAS","ASU",,,"https://en.wikipedia.org/wiki/Silvio_Pettirossi_International_Airport","Luque, Stroessner, Aeropuerto Internacional Silvio Pettirossi"
 6089,"SGAY","medium_airport","Aeropuerto Nacional de Juan De Ayolas",-27.378379,-56.856791,223,"SA","PY","PY-8","Ayolas","no","SGAY","AYO",,,"https://en.wikipedia.org/wiki/Juan_de_Ayolas_Airport",
 308256,"SGBA","small_airport","Aeródromo de Bella Vista Sur",-27.052393,-55.578026,650,"SA","PY","PY-7","Colonia Doctor Pastor Obligado","no","SGBA",,,,,
 515514,"SGCB","small_airport","Aeródromo Capitan Bado",-23.257493,-55.528057,1710,"SA","PY","PY-9","Capitan Bado","no","SGCB",,,,,
@@ -58574,6 +58574,8 @@
 529407,"SII4","small_airport","Fazenda Boqueirão Airport",-17.240872,-46.282036,1726,"SA","BR","BR-MG","João Pinheiro","no","SII4",,"MG0598",,,
 539303,"SII6","small_airport","Fazenda Nossa Senhora de Nazaré Airstrip",-15.110392,-50.629858,1033,"SA","BR","BR-GO","Araguapaz","no","SII6",,"GO0375",,,
 534493,"SII7","heliport","Socó Beach Residence Helipad",-2.929736,-41.334283,20,"SA","BR","BR-PI","Cajueiro da Praia","no","SII7",,"PI0112",,,
+549389,"SII8","small_airport","Fazenda Horizontina Leste Airport",-7.874319,-45.751614,1545,"SA","BR","BR-MA","Tasso Fragoso","no","SII8",,"MA0186",,,
+549391,"SII9","small_airport","Fazenda São Francisco Airstrip",-14.017783,-54.638508,1578,"SA","BR","BR-MT","Paranatinga","no","SII9",,"MT0790",,,
 36017,"SIIA","small_airport","Fazenda Paraná Airport",-11.7,-58.218056,653,"SA","BR","BR-MT","Brasnorte","no","SIIA",,"MT0097",,,
 36018,"SIIB","heliport","Suiço Heliport",-23.3799991607666,-46.606388092041016,3189,"SA","BR","BR-SP","Mairiporã","no","SIIB",,,,,
 36019,"SIIC","heliport","Caragoatá Heliport",-23.243658,-44.595978,66,"SA","BR","BR-RJ","Parati","no","SJSP",,"RJ0112",,,"SIIC"
@@ -58729,6 +58731,7 @@
 527475,"SIN2","small_airport","Fazenda Santa Cruz Airport",-12.245793,-51.837179,1044,"SA","BR","BR-MT","Bom Jesus do Araguaia","no","SIN2",,"MT1004",,,
 535039,"SIN3","small_airport","Fazenda Surubim Airport",-6.70403,-56.265243,783,"SA","BR","BR-PA","Itaituba","no","SIN3",,"PA0391",,,
 547648,"SIN4","small_airport","Fazenda Osmarilia Airport",-6.813645,-49.019358,486,"SA","BR","BR-TO","Muricilândia","no","SIN4",,"TO0138",,,
+549410,"SIN6","small_airport","Rancho Tandera Airstrip",2.419444,-60.9275,299,"SA","BR","BR-RR","Mucajaí","no","SIN6",,"RR0149",,,
 534519,"SIN7","small_airport","Fazenda Vista Alegre Airport",-11.077283,-55.772297,1053,"SA","BR","BR-MT","Itaúba","no","SIN7",,"MT1006",,,
 36126,"SINA","small_airport","São Francisco Airport",-22.788888931274,-53.197776794434,1122,"SA","BR","BR-PR","São Pedro Do Paraná","no",,,,,,"SINA"
 36127,"SINB","heliport","Tubarão Heliport",-23.829445,-45.388611,10,"SA","BR","BR-SP","Ilhabela","no","SINB",,"SP0531",,,
diff --git a/runways.csv b/runways.csv
index 1147cc1b2..45700d74d 100644
--- a/runways.csv
+++ b/runways.csv
@@ -19894,6 +19894,8 @@
 348932,300865,"JIQ",7874,,,0,0,"03",,,,,,"21",,,,,
 350135,323221,"JJD",7218,148,"ASPH",1,0,"08",-2.91085,-40.366199,86,63,,"26",-2.90199,-40.348499,89,243,
 252712,18253,"JLA",2200,60,"GRVL-DIRT-F",0,0,"04",,,,,,"22",,,,,
+549401,46450,"JM-0002",2300,50,"Grass",0,0,"08",,,,,,"26",,,,,
+549400,314186,"JM-0016",4000,48,"Rolled Asphalt",0,0,"09",,,,,,"27",,,,,
 267782,18254,"JMC",100,100,"ASPH",1,0,"H1",,,2,,,,,,,4,
 354993,339959,"JNZ",8202,,,0,0,"04",,,,,,"22",,,,,
 313296,302154,"JOP",3117,,,0,0,"03",,,,,,"21",,,,,
@@ -28515,11 +28517,12 @@
 325919,22104,"MI97",62,60,"Roof/Top",0,0,"H2",,,,,,"H2",,,,,
 252240,22105,"MI98",1750,90,"TURF",0,0,"E",,,,,,"W",,,,,
 254193,22106,"MI99",2300,120,"TURF",0,0,"E",,,,,,"W",,,,,
-237247,4679,"MKBS",3000,75,"ASP",0,0,"09",18.403900146484375,-76.97329711914062,,85.8,,"27",18.404600143432617,-76.9646987915039,,265.8,
+237247,4679,"MKBS",4769,75,"ASP",1,0,"09",18.4039,-76.973297,90,86,,"27",18.4046,-76.964699,90,266,
 237245,4680,"MKJP",8900,150,"ASP",1,0,"12",17.94029998779297,-76.79949951171875,8,112,,"30",17.931100845336914,-76.77570343017578,17,292,
 237248,4681,"MKJS",8735,150,"ASP",1,0,"07",18.498699188232422,-77.92479705810547,7,65.5,225,"25",18.508699417114258,-77.90190124511719,7,245.5,555
 237246,4682,"MKKJ",3412,76,"ASP",0,0,"09",18.19860076904297,-76.53959655761719,,86.7,,"27",18.199100494384766,-76.52970123291016,,266.7,290
 313308,302540,"MKN",3050,,,0,0,"14",,,,,,"32",,,,,
+549398,32020,"MKNG",2300,75,"Asphalt",0,0,"05",,,3,,,"23",,,,,
 237249,4683,"MKTP",4300,110,"ASP",1,0,"14",17.992399215698242,-76.82839965820312,13,131.1,800,"32",17.984699249267578,-76.81909942626953,16,311.1,700
 237589,4685,"ML-0001",4946,98,"LAT",1,0,"09",13.25529956817627,-10.511300086975098,525,88,,"27",13.255900382995605,-10.497400283813477,538,268,
 523461,31910,"MLIP",2850,75,"Turf",0,0,"5",,,,,,"23",,,,,
@@ -35622,6 +35625,7 @@
 262694,36015,"SIHY",59,59,"CON",0,0,"12",,,,,,,,,,,
 262871,36016,"SIHZ",66,66,"CON",0,0,"9",,,,,,"27",,,,,
 539304,539303,"SII6",3609,59,"GVL",0,0,"11",,,,,,"29",,,,,
+549390,549389,"SII8",3281,59,"GVL",0,0,"09",,,,,,"27",,,,,
 260560,36017,"SIIA",4593,59,"ASP",0,0,"9",,,,,,"27",,,,,
 263198,36018,"SIIB",69,69,"CON/GRS",0,0,"16",,,,,,"25",,,,,
 263069,36019,"SIIC",75,75,"CON",0,0,"6",,,,,,"15",,,,,
@@ -35766,6 +35770,7 @@
 261111,36125,"SIMZ",3871,115,"GRS",0,0,"2",,,,,,"20",,,,,
 535040,535039,"SIN3",2298,59,"Piçarra",0,0,"07",,,,,,"25",,,,,
 547650,547648,"SIN4",2454,59,"Earth",0,0,"14",,,,,,"32",,,,,
+549412,549410,"SIN6",2297,59,"Earth",0,0,"10",,,,,,"28",,,,,
 260923,36126,"SINA",2953,164,"GRS",0,0,"4",,,,,,"22",,,,,
 263243,36127,"SINB",62,62,"GRS",0,0,"14",,,,,,"23",,,,,
 261841,36128,"SINC",3117,59,"ASP",0,0,"1",,,,,,"19",,,,,