Mroe tweaks to routes