some more cleanups, updates