Toc fixes

This is super naive but works for me. Addresses #5