Updated todo's
Corrrected comment typo
Corrected comment