Cleanup, add makefile report target
Fix bus route section.