add goto text and better toc