Minor restructure and default heading value changes.