misc cleanup, typo fixes for WIP router