Adding emacs settings and some other minor changes to existing files