cleanups and changes