updates for org mode, including org-cgr.el