--- a/maxious-canberra-transit-feed/Makefile
+++ b/maxious-canberra-transit-feed/Makefile
@@ -1,19 +1,21 @@
 default: cbrfeed.zip
 
 cbrfeed.zip: cbrtable.yml createfeed.py
+	sh 06-cleanupyaml.sh
 	./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip
 
 cbrtable.yml: cbrtable.yml.in indent-route.pl
 	cp cbrtable.yml.in cbrtable.yml
 	@$(foreach ROUTE_FILE, $(wildcard output/*),  \
 		echo "Parsing $(ROUTE_FILE)"; \
-		echo "TODO: replace friendly timing spot names with OSM node IDs or geohash in $(ROUTE_FILE)"; \
-		echo "TODO: add inbetween stops in $(ROUTE_FILE)"; \
-	./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;)
+		./indent-route.pl < "$(ROUTE_FILE)" >> cbrtable.yml;)
 
 cbrtable.yml.in: cbrtable.yml.in.in
-	ruby 04-generateymlinclude.rb	
+	ruby 01-extracttimes.rb	
+	ruby 02-tidytimepoints.rb 
+	ruby 04-generateymlinclude.rb 
+	ruby 05-addbetweenpointstotimetables.rb 
 
 clean:
-	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~
+	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~ output/*