Small changes in charter 06
chapters 16-20