Added a few routing fixes and a minor validation addition