Add todos and extra section headings