fix and consolidate routing (late commit)