some fixes and tidy up to front end routers