small cleanups, notes