more routing, couple misc fixes