cleanups and some notes