Filled Out TableOfElements

And a few minor commenting changes.