Made some more uncommenting in emacs