Bib and ToC looking better, 2nd wave of changes done up to chp3