Clean up some more and add titles to pages.