a few changes, especially to org mode