Finished without corrections in chapters 6 and 7