added toc, + more fixed