route behavior more like original, e2e port almost done (*yawn*)