more route fixes, tweaks