Enhancements to the emacs task