more routing, couple minor fixes