Add some org-mode goodies and cleanup functions