Untested mods for new UPS configuration at FNAL.
Plus minor fixes.