Lots of miscelaneous changes, mostly from Duluth