Lots of changes to the TODO and a fix for the page-title leading
Merging Debolin's changes