route determination bug fix, misc cleanup
misc cleanup/reorg on $route binding