more fixes
Start on routing.