cleanups, updates