added issue numbers to TODOs