router, input, routes fixes