Massive changes mostly to configuration, touchups elsewhere.