minor fixes
refractor routing