Added table of contents and minor fixes