Update .gitignore with .toc
Integrate risks and challenges, add "final" touches