some fixes, in process of reifying routes in logic, updated generated route logic