more cleanups and updates