Added small TODOs