Add table of contents, refine some stuff