Revised chapters

Revised chapters 1 to 6, 10, 11