TOC

New options for Table of Contents.  Switched to id based toc.