Clarified a TODO and added another one to that section