added some org-mode changes, not autoloaded yet