Fix up some titles and structure stuff.