Change the phrasing on TODOs to be more accurate now