validation fixes, routing