Org mode updates + fix