added everything
removed emacs stuff
minor