Better chapter headings (now show the title and chapter number)