router improvements