Add emacs-w3m, minor changes