Add in list of * in TOC and in document.
Add in short caption names.