lots of routing changes, lots of new bugs