Reorganize preamble & adjust options to help get ToC page numbering correct