Cities

- Fixes in stops.txt
- Enhancements of the expansion script
- Expanding a couple abbreviations/numbers in stops.txt