Updated TODO Comments

Updated TODO Comments