fixing routes and validation controls