changed order of sections and added ToC