New TODOs, some new comments

Just bookkeeping to keep things in sync.