added TOC and some minor fixes