Emacs client fix; comments added