simple … added city for stop template
refactor for arrival_url element renaming, etc...