Routing

Fixes some long overdue routing bugs.