Remove lingering <p> elements. Add heading IDs.

Yeah, it's something I intend to fix.  Do you think you need them, though?