Some changes to Org mode