Further emacs tweaking