Added section titles and subtitles.
Fixed conflicts.