Improve many sections and include chapter2