Improvementes in chapters 4 and 5