More work on the router, testing bug fixes