Reverse atom order
Convert & to &amp; and fix headings