Issue #32: update TODOs