adding emacs and cleaning up