More org-mode tweaks, sort order, capture templates