move some things and add table of content