Some more changes for easier org-mode handling and export.