More updates, mainly based on emacsrocks.com