Issue #35: update TODOs