--- a/maxious-canberra-transit-feed/output/12-312-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/12-312-to-spence-terminus.stop_times.yml
@@ -1,12 +1,8 @@
 --- 
 long_name: To Spence Terminus
-between_stops: 
-  Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
-  Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
-  Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
-  City Interchange - Platform 5-Cameron Ave Bus Station - Platform 4: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
-  Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
-short_name: 12/312
-stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 746a, 752a], ["-", "-", "-", 802a, 804a, 808a, 816a, 820a, 825a, 831a], [726a, 745a, 803a, 821a, 823a, 827a, 835a, 839a, 844a, 850a], [826a, 845a, 903a, 921a, 923a, 927a, 934a, 938a, 942a, 948a], [901a, 920a, 937a, 954a, 956a, 1000a, 1007a, 1011a, 1015a, 1021a], [931a, 949a, 1005a, 1022a, 1024a, 1028a, 1035a, 1039a, 1043a, 1049a], [1001a, 1019a, 1035a, 1052a, 1054a, 1058a, 1105a, 1109a, 1113a, 1119a], [1031a, 1049a, 1105a, 1122a, 1124a, 1128a, 1135a, 1139a, 1143a, 1149a], [1101a, 1119a, 1135a, 1152a, 1154a, 1158a, 1205p, 1209p, 1213p, 1219p], [1131a, 1149a, 1205p, 1222p, 1224p, 1228p, 1235p, 1239p, 1243p, 1249p], [1201p, 1219p, 1235p, 1252p, 1254p, 1258p, 105p, 109p, 113p, 119p], [1231p, 1249p, 105p, 122p, 124p, 128p, 135p, 139p, 143p, 149p], [101p, 119p, 135p, 152p, 154p, 158p, 205p, 209p, 213p, 219p], [131p, 149p, 205p, 222p, 224p, 228p, 235p, 239p, 243p, 249p], [201p, 219p, 235p, 252p, 254p, 258p, 306p, 310p, 315p, 321p], [231p, 249p, 305p, 323p, 325p, 329p, 337p, 341p, 346p, 352p], [301p, 320p, 338p, 356p, 358p, 402p, 410p, 414p, 419p, 425p], [331p, 350p, 408p, 426p, 428p, 432p, 440p, 444p, 449p, 455p], [356p, 415p, 433p, 451p, 453p, 457p, 505p, 509p, 514p, 520p], [416p, 435p, 453p, 511p, 513p, 517p, 525p, 529p, 534p, 540p], [436p, 455p, 513p, 531p, 533p, 537p, 545p, 549p, 554p, 600p], [456p, 515p, 533p, 551p, 553p, 557p, 605p, 609p, 614p, 620p], [516p, 535p, 553p, 611p, 613p, 617p, 625p, 629p, 633p, 639p], [536p, 555p, 613p, 631p, 633p, 636p, 643p, 647p, 651p, 657p], [636p, 653p, 708p, 725p, 727p, 730p, 737p, 741p, 745p, 751p], ["-", "-", "-", 835p, 837p, 840p, 847p, 851p, 855p, 901p], ["-", "-", "-", 935p, 937p, 940p, 947p, 951p, 955p, 1001p], ["-", "-", "-", 1035p, 1037p, 1040p, 1047p, 1051p, 1055p, 1101p], ["-", "-", "-", 1135p, 1137p, 1140p, 1147p, 1151p, 1155p, 1201a]]
-time_points: [Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Copland College, Evatt, Spence Terminus]
+between_stops: {}
 
+short_name: 12 312
+stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 746a, 753a], ["-", "-", "-", 805a, 807a, 811a, 819a, 823a, 828a, 835a], [726a, 745a, 803a, 824a, 826a, 830a, 838a, 842a, 847a, 854a], [826a, 845a, 903a, 924a, 926a, 930a, 937a, 941a, 945a, 952a], [901a, 920a, 937a, 957a, 959a, 1003a, 1010a, 1014a, 1018a, 1025a], [931a, 949a, 1005a, 1025a, 1027a, 1031a, 1038a, 1042a, 1046a, 1053a], [1001a, 1019a, 1035a, 1055a, 1057a, 1101a, 1108a, 1112a, 1116a, 1123a], [1031a, 1049a, 1105a, 1125a, 1127a, 1131a, 1138a, 1142a, 1146a, 1153a], [1101a, 1119a, 1135a, 1155a, 1157a, 1201p, 1208p, 1212p, 1216p, 1223p], [1131a, 1149a, 1205p, 1225p, 1227p, 1231p, 1238p, 1242p, 1246p, 1253p], [1201p, 1219p, 1235p, 1255p, 1257p, 101p, 108p, 112p, 116p, 123p], [1231p, 1249p, 105p, 125p, 127p, 131p, 138p, 142p, 146p, 153p], [101p, 119p, 135p, 155p, 157p, 201p, 208p, 212p, 216p, 223p], [131p, 149p, 205p, 225p, 227p, 231p, 238p, 242p, 246p, 253p], [201p, 219p, 235p, 255p, 257p, 301p, 309p, 313p, 318p, 325p], [231p, 249p, 305p, 326p, 328p, 332p, 340p, 344p, 349p, 356p], [259p, 318p, 336p, 357p, 359p, 403p, 411p, 415p, 420p, 427p], [331p, 350p, 408p, 429p, 431p, 435p, 443p, 447p, 452p, 459p], [356p, 415p, 433p, 454p, 456p, 500p, 508p, 512p, 517p, 524p], [416p, 435p, 453p, 514p, 516p, 520p, 528p, 532p, 537p, 544p], [436p, 455p, 513p, 534p, 536p, 540p, 548p, 552p, 557p, 604p], [456p, 515p, 533p, 554p, 556p, 600p, 608p, 612p, 617p, 624p], [516p, 535p, 553p, 614p, 616p, 620p, 628p, 632p, 636p, 643p], [536p, 555p, 613p, 634p, 636p, 640p, 647p, 651p, 655p, 702p], [636p, 653p, 708p, 728p, 730p, 734p, 741p, 745p, 749p, 756p], ["-", "-", "-", 834p, 836p, 840p, 847p, 851p, 855p, 902p], ["-", "-", "-", 934p, 936p, 940p, 947p, 951p, 955p, 1002p], ["-", "-", "-", 1034p, 1036p, 1040p, 1047p, 1051p, 1055p, 1102p], ["-", "-", "-", 1134p, 1136p, 1140p, 1147p, 1151p, 1155p, 1202a]]
+time_points: [Tuggeranong Bus Station (Platform 8), Woden Bus Station (Platform 9), City Bus Station (Platform 3), Belconnen Community Bus Station (Platform 4), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 6), McKellar Shops, Copland College, Evatt Shops, Spence Terminus]
+