diff --git a/files/stops.txt b/files/stops.txt
index 58a9b4a..a8dc2fc 100644
--- a/files/stops.txt
+++ b/files/stops.txt
@@ -147,7 +147,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020007,Costa da Caparica (Terminal) P3,38.644300,-9.240650,0,1,0,0,,,Costa Da Caparica ( Terminal ) ( P 3 ),0,,,020007,,1,,,,Costa da Caparica,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020008,R Maria Beatriz Mexia (X) R Quinta dos Loios,38.641501,-9.203250,0,0,1,0,,,Cruzamento Entre ( Rua Maria Beatriz Mexia ) E Rua Quinta Dos Loios,0,,,020008,,1,,,,,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020009,ALMADA (LARGO CRISTO REI) TERMINAL,38.676490,-9.171100,0,0,1,0,,,Almada ( Largo Cristo Rei ) Terminal,0,,,020009,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-020010,R das Oliveiras (Parque infantil),38.641333,-9.197306,0,0,1,0,,,#N/A,0,,,020010,,1,,,,,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+020010,R das Oliveiras (Parque infantil),38.641333,-9.197306,0,0,1,0,,,Rua Das Oliveiras ( Parque Infantil ),0,,,020010,,1,,,,,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020011,ALMADA (AV CRISTO REI) NÚCLEO ÁGUA,38.679000,-9.167770,0,0,1,0,,,Almada ( Avenida Cristo Rei ) Núcleo Água,0,,,020011,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020012,ALMADA (AV CRISTO REI) NÚCLEO ÁGUA,38.678900,-9.167800,0,0,1,0,,,Almada ( Avenida Cristo Rei ) Núcleo Água,0,,,020012,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020013,ALMADA (AV CRISTO REI N41),38.677330,-9.167410,0,0,1,0,,,Almada ( Avenida Cristo Rei ( Número 41 ) ),0,,,020013,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1308,7 +1308,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 030561,Bº Zambujal,38.735902,-9.209415,1,0,0,0,,,Bairro Zambujal,0,,,030561,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 030563,Estr Zambujal (Escolas),38.733349,-9.216093,1,0,0,0,,,Estrada Zambujal ( Escolas ),0,,,030563,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,1,137,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030567,Av D João V 32,38.745457,-9.218137,1,0,0,0,,,Avenida Dom João Quinto 32,0,,,030567,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-030571,Estr do Seminário (Alfrapark),38.732911,-9.222544,1,0,0,0,,,Estrada Nacional 117 ( Alfapark ),0,,,030571,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+030571,Estr do Seminário (Alfrapark),38.732911,-9.222544,1,0,0,0,,,Estrada Do Seminário ( Alfrapark ),0,,,030571,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 030573,Estr Mun Cemitério (Rot Av Marconi),38.737636,-9.231675,1,0,0,0,,,Estrada Municipal Cemitério ( Rotunda Avenida Marconi ),0,,,030573,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 030574,Estr Mun Cemitério (Rot Av Marconi),38.737556,-9.231769,1,0,0,0,,,Estrada Municipal Cemitério ( Rotunda Avenida Marconi ),0,,,030574,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 030575,Av Marconi (Cemitério),38.743715,-9.235140,1,0,0,0,,,Avenida Marconi ( Cemitério ),0,,,030575,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1455,7 +1455,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 030781,Av Padre Bartolomeu Gusmão 1C,38.746328,-9.215090,1,0,0,0,,,Avenida Padre Bartolomeu Gusmão - Um Cê,0,,,030781,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030783,Av Padre Bartolomeu de Gusmão 46,38.743613,-9.218836,1,0,0,0,,,Avenida Padre Bartolomeu De Gusmão 46,0,,,030783,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 030785,Av D José Policarpo (C Comercial),38.728179,-9.216945,1,0,0,0,,,Avenida Dom José Policarpo ( Centro Comercial ),0,,,030785,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-030787,EN 117 (Alfrapark),38.732285,-9.222518,1,0,0,0,,,Estrada Nacional 117 ( Alfapark ),0,,,030787,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+030787,EN 117 (Alfrapark),38.732285,-9.222518,1,0,0,0,,,Estrada Nacional 117 ( Alfrapark ),0,,,030787,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 030790,Estr Alfragide (X) Av L Vasconcelos,38.736571,-9.216320,1,0,0,0,,,Cruzamento Entre ( Estrada Alfragide ) E Avenida L Vasconcelos,0,,,030790,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030791,Av D Fernando Piteira Santos 17,38.778089,-9.234596,1,0,0,0,,,Avenida Dom Fernando Piteira Santos 17,0,,,030791,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030792,Av D Fernando Piteira Santos 17A,38.778243,-9.234546,1,0,0,0,,,Avenida Dom Fernando Piteira Santos 17 Á,0,,,030792,,1,,,,Amadora,,,1115,Amadora,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -4765,7 +4765,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 090067,GAIO (R ALEXANDRE HERCULANO 99),38.670766,-9.003792,0,0,0,1,,,Gaio ( Rua Alexandre Herculano 99 ),0,,,090067,,1,,,,Gaio,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 090068,R António Hipólito da Costa 13,38.656662,-9.022582,0,0,0,1,,,Rua António Hipólito Da Costa 13,0,,,090068,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090069,GAIO (R ALEXANDRE HERCULANO 73),38.672043,-9.005248,0,0,0,1,,,Gaio ( Rua Alexandre Herculano 73 ),0,,,090069,,1,,,,Gaio,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-090070,R Duarte Pacheco (X) R Cortiça,38.654272,-9.021653,0,0,0,1,,,Cruzamento Entre ( Rua Eduardo Pacheco ) E Rua Cortiça,0,,,090070,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+090070,R Duarte Pacheco (X) R Cortiça,38.654272,-9.021653,0,0,0,1,,,Cruzamento Entre ( Rua Duarte Pacheco ) E Rua Cortiça,0,,,090070,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090071,ROSÁRIO (R ALEXANDRE HERCULANO 34),38.673858,-9.006806,0,0,0,1,,,Rosário ( Rua Alexandre Herculano 34 ),0,,,090071,,1,,,,Rosário,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090072,EB1 de Alhos Vedros,38.657596,-9.024712,0,0,0,1,,,Escola Básica - Um De Alhos Vedros,0,,,090072,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 090073,ROSÁRIO (R D NUNO ÁLVARES PEREIRA 41),38.676326,-9.009252,0,0,0,1,,,Rosário ( Rua Dom Nuno Álvares Pereira 41 ),0,,,090073,,1,,,,Rosário,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -4780,7 +4780,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 090082,ROSÁRIO (EM 1120) QTA ACHADO,38.676231,-9.001889,0,0,0,1,,,Rosário ( Estrada Municipal 1120 ) Quinta Achado,0,,,090082,,1,,,,Rosário,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090083,SARILHOS PEQUENOS (EM 1120 19),38.680850,-8.986065,0,0,0,1,,,Sarilhos Pequenos ( Estrada Municipal 1120 19 ),0,,,090083,,1,,,,Sarilhos Pequenos,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 090084,SARILHOS PEQUENOS (EM 1120 19),38.680949,-8.985722,0,0,0,1,,,Sarilhos Pequenos ( Estrada Municipal 1120 19 ),0,,,090084,,1,,,,Sarilhos Pequenos,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-090085,Av Humberto Delgado 7,38.655581,-9.027151,0,0,0,1,,,Avenida Humberto Delgado,0,,,090085,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+090085,Av Humberto Delgado 7,38.655581,-9.027151,0,0,0,1,,,Avenida Humberto Delgado 7,0,,,090085,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090086,R Marítimos (X) R Bem Fadada,38.657046,-9.030837,0,0,0,1,,,Cruzamento Entre ( Rua Marítimos ) E Rua Bem Fadada,0,,,090086,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090087,ROSÁRIO (R EÇA QUEIROZ 4),38.675520,-9.009522,0,0,0,1,,,Rosário ( Rua Eça Queiroz 4 ),0,,,090087,,1,,,,Rosário,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090088,R Cândido dos Reis (Centro de Saúde),38.658056,-9.027528,0,0,0,1,,,Rua Cândido Dos Reis ( Centro De Saúde ),0,,,090088,,1,,,,Moita,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6856,7 +6856,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 121241,R Norton de Matos,38.697834,-9.326966,1,0,0,0,,,Rua Norton De Matos,0,,,121241,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121242,R Norton de Matos - Escola,38.697681,-9.327013,1,0,0,0,,,Rua Norton De Matos - Escola,0,,,121242,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121243,Av Elvira Velez (Esc Preparatória),38.698251,-9.296763,1,0,0,0,,,Avenida Elvira Velez ( Escola Preparatória ),0,,,121243,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121247,EN 117 (Alfrapark),38.731909,-9.222693,1,0,0,0,,,Estrada Nacional 117 ( Alfapark ),0,,,121247,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+121247,EN 117 (Alfrapark),38.731909,-9.222693,1,0,0,0,,,Estrada Nacional 117 ( Alfrapark ),0,,,121247,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 121249,EN 117 (Centro Comercial),38.727853,-9.217312,1,0,0,0,,,Estrada Nacional 117 ( Centro Comercial ),0,,,121249,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121251,R Constituição (X) Estr c Cavalinhos,38.744169,-9.281042,1,0,0,0,,,Cruzamento Entre ( Rua Constituição ) E Estrada Cê Cavalinhos,0,,,121251,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121252,R Constituição (X) Estr Cavalinhos,38.743914,-9.281093,1,0,0,0,,,Cruzamento Entre ( Rua Constituição ) E Estrada Cavalinhos,0,,,121252,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0