some cleanups and more