Done fixes in router, invalid name for controller