Cleanup and updated toc file.