Added TODOs
Small clarification
Added TOC