Added subheadings and reorganized a bit.