Fixes to aid with template inheritance
Update PSR to use footnotes and add more chapters