add Section 2.2, 2.3, 3 and 3.1

and update the table of contents.