Added small TODOs.