little cleanups and notes for later