Corrected comment
Updating all TODO notes