Lots of misc changes and routing fixes.