Corrected a print message
Corrected another print
Added TODO task