Updated a couple packages to fix some issues.

Also updated the routing code a bit.