assorted updates from Friday
hopefully final cleanup update