Comment on a few TODOs, plus comment on links to wiki info