various routing fixes
Merge branch 'newgrants' into testing