rearranged so the blue headings come above the notes
merged changes with pulls of export/import