\#6: some fixes within chapters