Add headings, clarify, and generally improve stuff