more routing and library updates