improved routing + static management