Add comments
Modify TODO's section