a bunch of fixs for the last org-mode push.