more TOC bugsmashings