instruments: modify TODOs