move stuff to org-mode++ and add better comment fns