Clean ups
lots o changes for org and emacs 24.4 compat