Added info about emacs and did a few small changes