fix toc issues

 * fixes #181
 * fixes #204