Updated chapter numbers in headings, fixed some typos