Adding stop arrivals URL. Comma prefix not necessary. Rearranging some stuff.