Nonrefactor bugfixes

This PR eliminates #content>#heading, and cleans up/adds several pieces of skeleton/slots related to headings/titles.