General cleanup and updated TOC