More edits to router and fixes.