Some more work on TOC and other improvements.
More work on toc; remove fonts utility