Added updates from eduardo.  Consolidated org-mode changes into one-file