some cleanups and notes