More org mode customizations
With prefix arg, do original behavior