some routing touch up