cleanups, and updates