+ TOC, refactored bug reporting