notes, TODOs, and other minor tweaks