Fix imported chapters, improve headings