small tidy up, org-mode fixes