Modifications to set ids on actual headings as well as autogenerate them...

... based on heading content, so they're more meaningful.