Pushed up stuff from routing powwow with scott, as well as many other fixes.