more TODOs, and footnote errors