fixed up some routing