add org-mode defaults; minor rearrangement of code blocks