More org mode improvements