Refactoring the combined graph.
Reordering/renaming routes.
Even more route improvements!