bug fixes and TOC tweaks
Merge pull request #312 from clovis/master

bug fixes and TOC tweaks