More work on TOC; add support for 'huge'