cleanup, add minor notes to self as comments