cleanups and updates