org-mode related changes, journal.org helper fns and general enhancements