- Implement TOC for block classes
- some other minor cosmetic changes