misc cleanup in router, committing new build